From 18555acacbf57dcf8df8814ea799ebb059e6191b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 18 Feb 2020 14:56:07 -0500
Subject: [PATCH 001/137] Editing entries gets a collection url ...

Basically reverts ae2022bcf477a3adb8c232e518b2e4147ad3591a
---
 routes/cp.php                                             | 2 --
 src/Entries/Entry.php                                     | 4 +---
 src/Http/Controllers/CP/Collections/EntriesController.php | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/routes/cp.php b/routes/cp.php
index 2b616969d83..5bb2cb0f508 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -31,8 +31,6 @@
         Route::resource('structures.pages', 'StructurePagesController', ['only' => ['index', 'store']]);
     });
 
-    Route::get('structures/{collection}/entries/{entry}/{slug}', 'Collections\EntriesController@edit')->name('structures.entries.edit');
-
     Route::group(['namespace' => 'Collections'], function () {
         Route::resource('collections', 'CollectionsController');
         Route::get('collections/{collection}/scaffold', 'ScaffoldCollectionController@index')->name('collections.scaffold');
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index cc78a5d703e..ca08a793561 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -130,9 +130,7 @@ public function delete()
 
     public function editUrl()
     {
-        return $this->hasStructure()
-            ? $this->cpUrl('structures.entries.edit')
-            : $this->cpUrl('collections.entries.edit');
+        return $this->cpUrl('collections.entries.edit');
     }
 
     public function updateUrl()
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index c0b4495a7ca..e0c861c11ef 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -79,10 +79,6 @@ protected function indexQuery($collection)
 
     public function edit(Request $request, $collection, $entry)
     {
-        if ($collection->hasStructure() && $request->route()->getName() === 'statamic.cp.collections.entries.edit') {
-            return redirect()->to(cp_route('structures.entries.edit', [$collection->handle(), $entry->id(), $entry->slug()]));
-        }
-
         $this->authorize('view', $entry);
 
         $entry = $entry->fromWorkingCopy();

From fe11a91702db21c351ec2f9cf25f109b12ce66b1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 18 Feb 2020 15:01:32 -0500
Subject: [PATCH 002/137] Only list "nav" structures. 404 when accessing
 collection structures.

---
 .../CP/Structures/StructuresController.php            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/StructuresController.php
index 470d69f9c92..54501ebd510 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/StructuresController.php
@@ -20,7 +20,7 @@ public function index()
         $this->authorize('index', StructureContract::class, 'You are not authorized to view any structures.');
 
         $structures = Structure::all()->filter(function ($structure) {
-            return User::current()->can('view', $structure);
+            return !$structure->isCollectionBased() && User::current()->can('view', $structure);
         })->map(function ($structure) {
             $tree = $structure->in(Site::selected()->handle());
 
@@ -42,6 +42,8 @@ public function edit($structure)
     {
         $structure = Structure::find($structure);
 
+        abort_if($structure->isCollectionBased(), 404);
+
         $this->authorize('edit', $structure, 'You are not authorized to edit this structure.');
 
         $values = [
@@ -79,6 +81,9 @@ public function edit($structure)
     public function show(Request $request, $structure)
     {
         $structure = Structure::find($structure);
+
+        abort_if($structure->isCollectionBased(), 404);
+
         $site = $request->site ?? Site::selected()->handle();
 
         if (! $structure || ! $tree = $structure->in($site)) {
@@ -132,6 +137,8 @@ public function update(Request $request, $structure)
 
         $structure = Structure::find($structure);
 
+        abort_if($structure->isCollectionBased(), 404);
+
         $this->authorize('update', $structure, 'You are not authorized to edit this structure.');
 
         $expectedRoot = $structure->expectsRoot();
@@ -313,6 +320,8 @@ public function destroy($structure)
     {
         $structure = Structure::findByHandle($structure);
 
+        abort_if($structure->isCollectionBased(), 404);
+
         $this->authorize('delete', $structure, 'You are not authorized to delete this structure.');
 
         $structure->delete();

From 6d0c018b3cd6824e4bbdf7e3f14df0f1bf4bf2fb Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 18 Feb 2020 15:31:45 -0500
Subject: [PATCH 003/137] Tests for not being able to edit or see collection
 structures

---
 .../Feature/Structures/EditStructureTest.php  | 35 ++++++--------
 tests/Feature/Structures/MocksStructures.php  | 47 +++++++++++++++++++
 .../Structures/ViewStructureListingTest.php   | 45 ++++++------------
 3 files changed, 76 insertions(+), 51 deletions(-)
 create mode 100644 tests/Feature/Structures/MocksStructures.php

diff --git a/tests/Feature/Structures/EditStructureTest.php b/tests/Feature/Structures/EditStructureTest.php
index 8848e62278e..bf6323c9493 100644
--- a/tests/Feature/Structures/EditStructureTest.php
+++ b/tests/Feature/Structures/EditStructureTest.php
@@ -14,11 +14,12 @@ class EditStructureTest extends TestCase
 {
     use FakesRoles;
     use PreventSavingStacheItemsToDisk;
+    use MocksStructures;
 
     /** @test */
     function it_shows_the_edit_form_if_user_has_edit_permission()
     {
-        $structure = $this->createStructure('foo');
+        $structure = $this->createNavStructure('foo');
         Facades\Structure::shouldReceive('all')->andReturn(collect([$structure]));
         Facades\Structure::shouldReceive('find')->andReturn($structure);
 
@@ -35,7 +36,7 @@ function it_shows_the_edit_form_if_user_has_edit_permission()
     /** @test */
     function it_denies_access_if_user_doesnt_have_edit_permission()
     {
-        $structure = $this->createStructure('foo');
+        $structure = $this->createNavStructure('foo');
         Facades\Structure::shouldReceive('all')->andReturn(collect([$structure]));
         Facades\Structure::shouldReceive('find')->andReturn($structure);
 
@@ -50,25 +51,19 @@ function it_denies_access_if_user_doesnt_have_edit_permission()
             ->assertSessionHas('error');
     }
 
-    private function createStructure($handle)
+    /** @test */
+    function attempting_to_edit_a_collection_based_structure_should_404()
     {
-        return tap(Mockery::mock(Structure::class), function ($s) use ($handle) {
-            $s->shouldReceive('in')->andReturn($this->createStructureTree($handle));
-            $s->shouldReceive('title')->andReturn($handle);
-            $s->shouldReceive('handle')->andReturn($handle);
-            $s->shouldReceive('uris')->andReturn(collect());
-            $s->shouldReceive('collection')->andReturnFalse();
-            $s->shouldReceive('collections')->andReturn(collect());
-            $s->shouldReceive('expectsRoot')->andReturnTrue();
-            $s->shouldReceive('flattenedPages')->andReturn(collect());
-        });
-    }
+        $structure = $this->createCollectionStructure('foo');
+        Facades\Structure::shouldReceive('all')->andReturn(collect([$structure]));
+        Facades\Structure::shouldReceive('find')->andReturn($structure);
 
-    private function createStructureTree($handle)
-    {
-        return tap(Mockery::mock(Tree::class), function ($s) use ($handle) {
-            $s->shouldReceive('editUrl')->andReturn('/tree-edit-url');
-            $s->shouldReceive('route')->andReturn('/route');
-        });
+        $this->setTestRoles(['test' => ['access cp', 'edit foo structure']]);
+        $user = Facades\User::make()->assignRole('test')->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->get(route('statamic.cp.structures.edit', $structure->handle()))
+            ->assertNotFound();
     }
 }
diff --git a/tests/Feature/Structures/MocksStructures.php b/tests/Feature/Structures/MocksStructures.php
new file mode 100644
index 00000000000..28576598022
--- /dev/null
+++ b/tests/Feature/Structures/MocksStructures.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Feature\Structures;
+
+use Mockery;
+use Statamic\Contracts\Structures\Structure;
+use Statamic\Structures\Tree;
+
+trait MocksStructures
+{
+    private function createStructure($handle)
+    {
+        return tap(Mockery::mock(Structure::class), function ($s) use ($handle) {
+            $s->shouldReceive('in')->andReturn($this->createStructureTree($handle));
+            $s->shouldReceive('title')->andReturn($handle);
+            $s->shouldReceive('handle')->andReturn($handle);
+            $s->shouldReceive('editUrl')->andReturn('/structure-edit-url');
+            $s->shouldReceive('deleteUrl')->andReturn('/structure-delete-url');
+        });
+    }
+
+    private function createNavStructure($structure)
+    {
+        return tap($this->createStructure($structure), function ($s) {
+            $s->shouldReceive('collection')->andReturnNull();
+            $s->shouldReceive('isCollectionBased')->andReturnFalse();
+            $s->shouldReceive('collections')->andReturn(collect());
+            $s->shouldReceive('expectsRoot')->andReturnTrue();
+        });
+    }
+
+    private function createCollectionStructure($structure)
+    {
+        return tap($this->createStructure($structure), function ($s) {
+            $s->shouldReceive('collection')->andReturn(true); // should return a collection instance but we're not using it in tests yet
+            $s->shouldReceive('isCollectionBased')->andReturnTrue();
+        });
+    }
+
+    private function createStructureTree($handle)
+    {
+        return tap(Mockery::mock(Tree::class), function ($s) use ($handle) {
+            $s->shouldReceive('editUrl')->andReturn('/tree-edit-url');
+            $s->shouldReceive('route')->andReturn('/route');
+        });
+    }
+}
diff --git a/tests/Feature/Structures/ViewStructureListingTest.php b/tests/Feature/Structures/ViewStructureListingTest.php
index 00238144b1d..9056298c0cb 100644
--- a/tests/Feature/Structures/ViewStructureListingTest.php
+++ b/tests/Feature/Structures/ViewStructureListingTest.php
@@ -9,17 +9,19 @@
 use Statamic\Structures\Tree;
 use Statamic\Structures\Structure;
 use Tests\PreventSavingStacheItemsToDisk;
+use Tests\Feature\Structures\MocksStructures;
 
 class ViewStructureListingTest extends TestCase
 {
-    use PreventSavingStacheItemsToDisk;
+    use PreventSavingStacheItemsToDisk, MocksStructures;
 
     /** @test */
-    function it_shows_a_list_of_structures()
+    function it_shows_a_list_of_nav_structures()
     {
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createStructure('foo'),
-            'bar' => $structureB = $this->createStructure('bar')
+            'foo' => $structureA = $this->createNavStructure('foo'),
+            'bar' => $structureB = $this->createNavStructure('bar'),
+            'baz' => $structureC = $this->createCollectionStructure('baz'),
         ]));
 
         $user = Facades\User::make()->makeSuper()->save();
@@ -52,8 +54,8 @@ function it_filters_out_structures_the_user_cannot_access()
     {
         $this->withoutExceptionHandling();
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createStructure('foo'),
-            'bar' => $structureB = $this->createStructure('bar')
+            'foo' => $structureA = $this->createNavStructure('foo'),
+            'bar' => $structureB = $this->createNavStructure('bar')
         ]));
         $this->setTestRoles(['test' => ['access cp', 'view bar structure']]);
         $user = Facades\User::make()->assignRole('test')->save();
@@ -72,8 +74,8 @@ function it_filters_out_structures_the_user_cannot_access()
     function it_doesnt_filter_out_structures_if_they_have_permission_to_configure()
     {
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createStructure('foo'),
-            'bar' => $structureB = $this->createStructure('bar')
+            'foo' => $structureA = $this->createNavStructure('foo'),
+            'bar' => $structureB = $this->createNavStructure('bar')
         ]));
         $this->setTestRoles(['test' => ['access cp', 'configure structures', 'view bar structure']]);
         $user = Facades\User::make()->assignRole('test')->save();
@@ -92,8 +94,8 @@ function it_doesnt_filter_out_structures_if_they_have_permission_to_configure()
     function it_denies_access_when_there_are_no_permitted_structures()
     {
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createStructure('foo'),
-            'bar' => $structureB = $this->createStructure('bar')
+            'foo' => $structureA = $this->createNavStructure('foo'),
+            'bar' => $structureB = $this->createNavStructure('bar')
         ]));
 
         $this->setTestRoles(['test' => ['access cp']]);
@@ -134,7 +136,7 @@ function create_structure_button_is_not_visible_without_permission_to_configure(
     function delete_button_is_visible_with_permission_to_configure()
     {
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $this->createStructure('foo'),
+            'foo' => $this->createNavStructure('foo'),
         ]));
 
         $this->setTestRoles(['test' => ['access cp', 'configure structures']]);
@@ -152,7 +154,7 @@ function delete_button_is_not_visible_without_permission_to_configure()
         $this->markTestIncomplete();
 
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $this->createStructure('foo'),
+            'foo' => $this->createNavStructure('foo'),
         ]));
 
         $this->setTestRoles(['test' => ['access cp', 'view foo structure']]);
@@ -164,25 +166,6 @@ function delete_button_is_not_visible_without_permission_to_configure()
             ->assertDontSee('Delete');
     }
 
-    private function createStructure($handle)
-    {
-        return tap(Mockery::mock(Structure::class), function ($s) use ($handle) {
-            $s->shouldReceive('in')->andReturn($this->createStructureTree($handle));
-            $s->shouldReceive('title')->andReturn($handle);
-            $s->shouldReceive('handle')->andReturn($handle);
-            $s->shouldReceive('collection')->andReturnFalse();
-            $s->shouldReceive('editUrl')->andReturn('/structure-edit-url');
-            $s->shouldReceive('deleteUrl')->andReturn('/structure-delete-url');
-        });
-    }
-
-    private function createStructureTree($handle)
-    {
-        return tap(Mockery::mock(Tree::class), function ($s) use ($handle) {
-            $s->shouldReceive('editUrl')->andReturn('/tree-edit-url');
-        });
-    }
-
     private function setTestRoles($roles)
     {
         $roles = collect($roles)->map(function ($permissions, $handle) {

From e38f9079ef7d54dcadf32201d9e55e4bc6a80c4a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 18 Feb 2020 16:24:42 -0500
Subject: [PATCH 004/137] Bring back and fix collection listing test

---
 .../Collections/ViewCollectionListingTest.php | 127 +++++++-----------
 1 file changed, 51 insertions(+), 76 deletions(-)

diff --git a/tests/Feature/Collections/ViewCollectionListingTest.php b/tests/Feature/Collections/ViewCollectionListingTest.php
index 4a2ac270ce0..83280e0be38 100644
--- a/tests/Feature/Collections/ViewCollectionListingTest.php
+++ b/tests/Feature/Collections/ViewCollectionListingTest.php
@@ -2,40 +2,53 @@
 
 namespace Tests\Feature\Collections;
 
-use Mockery;
+use Facades\Tests\Factories\EntryFactory;
 use Statamic\Facades;
 use Tests\TestCase;
 use Tests\FakesRoles;
 use Statamic\Auth\User;
 use Statamic\Entries\Collection;
+use Tests\PreventSavingStacheItemsToDisk;
 
 class ViewCollectionListingTest extends TestCase
 {
     use FakesRoles;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->markTestIncomplete(); // TODO. It's changed since we moved to a vue component.
-    }
+    use PreventSavingStacheItemsToDisk;
 
     /** @test */
     function it_shows_a_list_of_collections()
     {
-        Facades\Collection::shouldReceive('all')->andReturn(collect([
-            'foo' => $collectionA = $this->createCollection('foo'),
-            'bar' => $collectionB = $this->createCollection('bar')
-        ]));
+        $collectionA = $this->createCollection('foo');
+        $collectionB = $this->createCollection('bar');
+        EntryFactory::id('1')->collection($collectionB)->create();
 
-        $user = User::make()->makeSuper();
+        $user = tap(User::make()->makeSuper())->save();
 
         $response = $this
             ->actingAs($user)
             ->get(cp_route('collections.index'))
             ->assertSuccessful()
             ->assertViewHas('collections', collect([
-                'foo' => $collectionA,
-                'bar' => $collectionB
+                [
+                    'id' => 'foo',
+                    'title' => 'Foo',
+                    'entries' => 0,
+                    'edit_url' => 'http://localhost/cp/collections/foo/edit',
+                    'delete_url' => 'http://localhost/cp/collections/foo',
+                    'entries_url' => 'http://localhost/cp/collections/foo',
+                    'scaffold_url' => 'http://localhost/cp/collections/foo/scaffold',
+                    'deleteable' => true,
+                ],
+                [
+                    'id' => 'bar',
+                    'title' => 'Bar',
+                    'entries' => 1,
+                    'edit_url' => 'http://localhost/cp/collections/bar/edit',
+                    'delete_url' => 'http://localhost/cp/collections/bar',
+                    'entries_url' => 'http://localhost/cp/collections/bar',
+                    'scaffold_url' => 'http://localhost/cp/collections/bar/scaffold',
+                    'deleteable' => true,
+                ]
             ]))
             ->assertDontSee('no-results');
     }
@@ -43,7 +56,7 @@ function it_shows_a_list_of_collections()
     /** @test */
     function it_shows_no_results_when_there_are_no_collections()
     {
-        $user = User::make()->makeSuper();
+        $user = tap(User::make()->makeSuper())->save();
 
         $response = $this
             ->actingAs($user)
@@ -56,54 +69,46 @@ function it_shows_no_results_when_there_are_no_collections()
     /** @test */
     function it_filters_out_collections_the_user_cannot_access()
     {
-        Facades\Collection::shouldReceive('all')->andReturn(collect([
-            'foo' => $collectionA = $this->createCollection('foo'),
-            'bar' => $collectionB = $this->createCollection('bar')
-        ]));
-        $this->setTestRoles(['test' => ['access cp', 'view bar collection']]);
-        $user = Facades\User::make()->assignRole('test');
+        $collectionA = $this->createCollection('foo');
+        $collectionB = $this->createCollection('bar');
+        $this->setTestRoles(['test' => ['access cp', 'view bar entries']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
 
         $response = $this
             ->actingAs($user)
             ->get(cp_route('collections.index'))
             ->assertSuccessful()
-            ->assertViewHas('collections', collect([
-                'bar' => $collectionB
-            ]))
+            ->assertViewHas('collections', function ($collections) {
+                return count($collections) === 1 && $collections[0]['id'] === 'bar';
+            })
             ->assertDontSee('no-results');
     }
 
     /** @test */
     function it_doesnt_filter_out_collections_if_they_have_permission_to_configure()
     {
-        Facades\Collection::shouldReceive('all')->andReturn(collect([
-            'foo' => $collectionA = $this->createCollection('foo'),
-            'bar' => $collectionB = $this->createCollection('bar')
-        ]));
-        $this->setTestRoles(['test' => ['access cp', 'configure collections', 'view bar collection']]);
-        $user = Facades\User::make()->assignRole('test');
+        $collectionA = $this->createCollection('foo');
+        $collectionB = $this->createCollection('bar');
+        $this->setTestRoles(['test' => ['access cp', 'configure collections', 'view bar entries']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
 
         $response = $this
             ->actingAs($user)
             ->get(cp_route('collections.index'))
             ->assertSuccessful()
-            ->assertViewHas('collections', collect([
-                'foo' => $collectionA,
-                'bar' => $collectionB
-            ]))
+            ->assertViewHas('collections', function ($collections) {
+                return $collections->map->id->all() === ['foo', 'bar'];
+            })
             ->assertDontSee('no-results');
     }
 
     /** @test */
     function it_denies_access_when_there_are_no_permitted_collections()
     {
-        Facades\Collection::shouldReceive('all')->andReturn(collect([
-            'foo' => $collectionA = $this->createCollection('foo'),
-            'bar' => $collectionB = $this->createCollection('bar')
-        ]));
-
+        $collectionA = $this->createCollection('foo');
+        $collectionB = $this->createCollection('bar');
         $this->setTestRoles(['test' => ['access cp']]);
-        $user = Facades\User::make()->assignRole('test');
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
 
         $response = $this
             ->from('/cp/original')
@@ -116,7 +121,7 @@ function it_denies_access_when_there_are_no_permitted_collections()
     function create_collection_button_is_visible_with_permission_to_configure()
     {
         $this->setTestRoles(['test' => ['access cp', 'configure collections']]);
-        $user = Facades\User::make()->assignRole('test');
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
 
         $response = $this
             ->actingAs($user)
@@ -127,49 +132,19 @@ function create_collection_button_is_visible_with_permission_to_configure()
     /** @test */
     function create_collection_button_is_not_visible_without_permission_to_configure()
     {
-        $this->setTestRoles(['test' => ['access cp']]);
-        $user = Facades\User::make()->assignRole('test');
+        $collectionA = $this->createCollection('foo');
+        $this->setTestRoles(['test' => ['access cp', 'view foo entries']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
 
         $response = $this
             ->actingAs($user)
             ->get(cp_route('collections.index'))
+            ->assertOk()
             ->assertDontSee('Create Collection');
     }
 
-    /** @test */
-    function delete_button_is_visible_with_permission_to_configure()
-    {
-        Facades\Collection::shouldReceive('all')->andReturn(collect([
-            'foo' => $this->createCollection('foo'),
-        ]));
-
-        $this->setTestRoles(['test' => ['access cp', 'configure collections']]);
-        $user = Facades\User::make()->assignRole('test');
-
-        $response = $this
-            ->actingAs($user)
-            ->get(cp_route('collections.index'))
-            ->assertSee('Delete');
-    }
-
-    /** @test */
-    function delete_button_is_not_visible_without_permission_to_configure()
-    {
-        Facades\Collection::shouldReceive('all')->andReturn(collect([
-            'foo' => $this->createCollection('foo'),
-        ]));
-
-        $this->setTestRoles(['test' => ['access cp', 'view foo collection']]);
-        $user = Facades\User::make()->assignRole('test');
-
-        $response = $this
-            ->actingAs($user)
-            ->get(cp_route('collections.index'))
-            ->assertDontSee('Delete');
-    }
-
     private function createCollection($handle)
     {
-        return tap(new Collection)->path($handle);
+        return tap((new Collection)->handle($handle))->save();
     }
 }

From b68e3810911bd7096893025733065536eb2c573d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 18 Feb 2020 16:28:38 -0500
Subject: [PATCH 005/137] Bring back and fix delete collection test

---
 tests/Feature/Collections/DeleteCollectionTest.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/Feature/Collections/DeleteCollectionTest.php b/tests/Feature/Collections/DeleteCollectionTest.php
index 49da03d75ea..72183a3bdd9 100644
--- a/tests/Feature/Collections/DeleteCollectionTest.php
+++ b/tests/Feature/Collections/DeleteCollectionTest.php
@@ -35,10 +35,8 @@ function it_denies_access_if_you_dont_have_permission()
     /** @test */
     function it_deletes_the_collection()
     {
-        $this->markTestIncomplete(); // TODO: Skipped until ->delete() is reimplemented
-
         $this->setTestRoles(['test' => ['access cp', 'configure collections']]);
-        $user = User::make()->assignRole('test');
+        $user = tap(User::make()->assignRole('test'))->save();
 
         $collection = Collection::make('test')->save();
         $this->assertCount(1, Collection::all());
@@ -46,8 +44,7 @@ function it_deletes_the_collection()
         $this
             ->actingAs($user)
             ->delete(cp_route('collections.destroy', $collection->handle()))
-            ->assertRedirect(cp_route('collections.index'))
-            ->assertSessionHas('success');
+            ->assertOk();
 
         $this->assertCount(0, Collection::all());
     }

From c57679c62c540b55742d553d11f38a79385e1374 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 18 Feb 2020 16:38:43 -0500
Subject: [PATCH 006/137] Basic test for regular collection show page (entry
 listing)

---
 .../Collections/ShowRegularCollectionTest.php | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 tests/Feature/Collections/ShowRegularCollectionTest.php

diff --git a/tests/Feature/Collections/ShowRegularCollectionTest.php b/tests/Feature/Collections/ShowRegularCollectionTest.php
new file mode 100644
index 00000000000..6401b64c982
--- /dev/null
+++ b/tests/Feature/Collections/ShowRegularCollectionTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Collections;
+
+use Facades\Tests\Factories\EntryFactory;
+use Tests\TestCase;
+use Tests\FakesRoles;
+use Statamic\Facades\User;
+use Statamic\Facades\Collection;
+use Tests\PreventSavingStacheItemsToDisk;
+
+class ShowRegularCollectionTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    function it_shows_the_entry_listing_page_if_you_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+        EntryFactory::id('1')->collection($collection)->create();
+
+        $this
+            ->actingAs($user)
+            ->get($collection->showUrl())
+            ->assertOk()
+            ->assertViewIs('statamic::collections.show')
+            ->assertViewHas('collection', $collection);
+    }
+
+    /** @test */
+    function it_shows_the_empty_entry_listing_page_if_you_have_permission_and_there_are_no_entries()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+
+        $this
+            ->actingAs($user)
+            ->get($collection->showUrl())
+            ->assertOk()
+            ->assertViewIs('statamic::collections.empty');
+    }
+
+    /** @test */
+    function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test'))->save();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->get($collection->showUrl())
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+    }
+}

From 4f070640b8d702e4a980767f384fda87219ae891 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 19 Feb 2020 09:57:27 -0500
Subject: [PATCH 007/137] Remove empty state from view. It has a dedicated
 empty view.

---
 resources/views/collections/show.blade.php | 39 ++++++----------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index 60b34b64308..304e79ff52b 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -38,34 +38,15 @@
         </div>
     </header>
 
-    @if ($collection->queryEntries()->count())
-
-        <entry-list
-            collection="{{ $collection->handle() }}"
-            initial-sort-column="{{ $collection->sortField() }}"
-            initial-sort-direction="{{ $collection->sortDirection() }}"
-            :filters="{{ $filters->toJson() }}"
-            action-url="{{ cp_route('collections.entries.actions', $collection->handle()) }}"
-            :reorderable="{{ Statamic\Support\Str::bool($collection->orderable() && $user->can('reorder', $collection)) }}"
-            reorder-url="{{ cp_route('collections.entries.reorder', $collection->handle()) }}"
-            structure-url="{{ optional($collection->structure())->showUrl() }}"
-        ></entry-list>
-
-    @else
-
-        @component('statamic::partials.create-first', [
-            'resource' => __("{$collection->title()} entry"),
-            'svg' => 'empty/collection', // TODO: Do we want separate entry SVG?
-            'can' => $user->can('create', ['Statamic\Contracts\Entries\Entry', $collection])
-        ])
-            @slot('button')
-                <create-entry-button
-                    url="{{ cp_route('collections.entries.create', [$collection->handle(), $site->handle()]) }}"
-                    :blueprints="{{ $blueprints->toJson() }}">
-                </create-entry-button>
-            @endslot
-        @endcomponent
-
-    @endif
+    <entry-list
+        collection="{{ $collection->handle() }}"
+        initial-sort-column="{{ $collection->sortField() }}"
+        initial-sort-direction="{{ $collection->sortDirection() }}"
+        :filters="{{ $filters->toJson() }}"
+        action-url="{{ cp_route('collections.entries.actions', $collection->handle()) }}"
+        :reorderable="{{ Statamic\Support\Str::bool($collection->orderable() && $user->can('reorder', $collection)) }}"
+        reorder-url="{{ cp_route('collections.entries.reorder', $collection->handle()) }}"
+        structure-url="{{ optional($collection->structure())->showUrl() }}"
+    ></entry-list>
 
 @endsection

From e5e6ecf190f528f11028c0422edcb5cb5ca2828e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 20 Feb 2020 11:32:49 -0500
Subject: [PATCH 008/137] Wrapper class is now bound in vue so we can change it
 on the fly

---
 resources/js/app.js                              | 4 ++++
 resources/views/layout.blade.php                 | 2 +-
 resources/views/partials/global-header.blade.php | 2 +-
 resources/views/partials/scripts.blade.php       | 4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index 0eef2d9d570..f9e1ba75c88 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -163,6 +163,10 @@ Statamic.app({
 
         stackCount() {
             return this.$stacks.count();
+        },
+
+        wrapperClass() {
+            return this.$config.get('wrapperClass', 'max-w-xl');
         }
 
     },
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index 404f5f1ee5e..3e964e8af7f 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -14,7 +14,7 @@
             @include('statamic::partials.nav-main')
 
             <div class="workspace">
-                  <div class="page-wrapper @yield('wrapper_class')">
+                  <div class="page-wrapper" :class="wrapperClass">
                         @yield('content')
                   </div>
             </div>
diff --git a/resources/views/partials/global-header.blade.php b/resources/views/partials/global-header.blade.php
index cee5c422587..62c3e93c1f1 100644
--- a/resources/views/partials/global-header.blade.php
+++ b/resources/views/partials/global-header.blade.php
@@ -8,7 +8,7 @@
         </a>
     </div>
 
-    <div class="px-4 w-full flex-1 mx-auto @yield('wrapper_class', 'max-w-xl')">
+    <div class="px-4 w-full flex-1 mx-auto" :class="wrapperClass">
         <global-search endpoint="{{ cp_route('search') }}" placeholder="{{ __('Search...') }}">
         </global-search>
     </div>
diff --git a/resources/views/partials/scripts.blade.php b/resources/views/partials/scripts.blade.php
index e8218d98778..3b697c2b3e2 100644
--- a/resources/views/partials/scripts.blade.php
+++ b/resources/views/partials/scripts.blade.php
@@ -11,7 +11,9 @@
 @endforeach
 
 <script>
-    Statamic.config(@json(Statamic::jsonVariables(request())));
+    Statamic.config(@json(array_merge(Statamic::jsonVariables(request()), [
+        'wrapperClass' => $__env->getSection('wrapper_class')
+    ])));
     Statamic.start();
 </script>
 

From 6ec1293effb4a35378984036e44d2d8cdaeb4cdf Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 20 Feb 2020 11:42:38 -0500
Subject: [PATCH 009/137] Bunch of collection/structure tweaks ...

- Collection show view now shows a page tree if the collection has a structure.
- You can switch between the tree and regular listing. It'll remember it in local storage.
- Structure::make() accepts a handle.
- $structure->handle() can be passed null and it'll still be chainable
- The page tree component just does the page tree stuff, emits events, and just leaves the buttons etc to be handled in a parent component.
- Page tree loads intial pages with ajax instead of passing the initial values. Unnecessary maintenance burden, not a huge deal.
---
 resources/js/app.js                           |   3 +-
 resources/js/components/collections/View.vue  | 193 ++++++++++++++++++
 .../js/components/structures/PageTree.vue     | 126 +++---------
 resources/js/components/structures/View.vue   | 101 +++++++++
 resources/views/collections/empty.blade.php   |  24 +--
 resources/views/collections/show.blade.php    |  79 ++++---
 resources/views/structures/show.blade.php     |  26 +--
 .../Structures/StructureRepository.php        |   1 +
 .../CP/Collections/CollectionsController.php  |  42 +++-
 .../CP/Structures/StructuresController.php    |   7 -
 .../Repositories/StructureRepository.php      |   4 +-
 src/Structures/Structure.php                  |   2 +-
 tests/FakesRoles.php                          |   2 +-
 .../Collections/ShowCollectionTest.php        |  47 +++++
 .../Collections/ShowRegularCollectionTest.php |  41 +---
 .../ShowStructuredCollectionTest.php          |  41 ++++
 16 files changed, 500 insertions(+), 239 deletions(-)
 create mode 100644 resources/js/components/collections/View.vue
 create mode 100644 resources/js/components/structures/View.vue
 create mode 100644 tests/Feature/Collections/ShowCollectionTest.php
 create mode 100644 tests/Feature/Collections/ShowStructuredCollectionTest.php

diff --git a/resources/js/app.js b/resources/js/app.js
index f9e1ba75c88..3ab09dbd974 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -103,7 +103,6 @@ Statamic.app({
     components: {
         GlobalSearch: require('./components/GlobalSearch.vue').default,
         SiteSelector: require('./components/SiteSelector.vue').default,
-        PageTree: require('./components/structures/PageTree.vue').default,
         Login: require('./components/login/login'),
         LoginModal: require('./components/login/LoginModal.vue').default,
         BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
@@ -128,10 +127,12 @@ Statamic.app({
         CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
         CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
         CollectionEditForm: require('./components/collections/EditForm.vue').default,
+        CollectionView: require('./components/collections/View.vue').default,
         SessionExpiry: require('./components/SessionExpiry.vue').default,
         StructureWizard: require('./components/structures/Wizard.vue').default,
         StructureListing: require('./components/structures/Listing.vue').default,
         StructureEditForm: require('./components/structures/EditForm.vue').default,
+        StructureView: require('./components/structures/View.vue').default,
         Stacks: require('./components/stacks/Stacks.vue').default,
         TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
         TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
new file mode 100644
index 00000000000..3e1167614ff
--- /dev/null
+++ b/resources/js/components/collections/View.vue
@@ -0,0 +1,193 @@
+<template>
+
+    <div>
+
+        <header class="mb-3">
+
+            <breadcrumb :url="breadcrumbUrl" :title="__('Collections')" />
+
+            <div class="flex items-center">
+                <h1 class="flex-1" v-text="title" />
+
+                <dropdown-list class="mr-1">
+                    <slot name="twirldown" />
+                </dropdown-list>
+
+                <div class="btn-group-flat mr-2" v-if="structured">
+                    <button @click="view = 'tree'" :class="{'active': view === 'tree'}">
+                        <svg-icon name="structures" class="h-4 w-4"/>
+                    </button>
+                    <button @click="view = 'list'" :class="{'active': view === 'list'}">
+                        <svg-icon name="assets-mode-table" class="h-4 w-4" />
+                    </button>
+                </div>
+
+                <template v-if="view === 'tree'">
+
+                    <a
+                        class="text-2xs text-blue mr-2 underline"
+                        v-if="treeIsDirty"
+                        v-text="__('Discard changes')"
+                        @click="cancelTreeProgress"
+                    />
+
+                    <dropdown-list>
+                        <template #trigger>
+                            <button class="btn" v-text="`${__('Add Link')}`" />
+                        </template>
+                        <dropdown-item :text="__('Link to URL')" @click="linkTreePage" />
+                        <dropdown-item :text="__('Link to Entry')" @click="linkTreeEntries" />
+                    </dropdown-list>
+
+                    <button
+                        class="btn mx-2"
+                        :class="{ 'disabled': !treeIsDirty }"
+                        :disabled="!treeIsDirty"
+                        @click="saveTree"
+                        v-text="__('Save Changes')" />
+
+                </template>
+
+                <create-entry-button
+                    button-class="btn-primary"
+                    :url="createUrl"
+                    :blueprints="blueprints" />
+            </div>
+
+        </header>
+
+        <entry-list
+            v-show="view === 'list'"
+            :collection="handle"
+            :initial-sort-column="sortColumn"
+            :initial-sort-direction="sortDirection"
+            :filters="filters"
+            :action-url="actionUrl"
+            :reorderable="reorderable"
+            :reorder-url="reorderUrl"
+        />
+
+        <page-tree
+            v-if="structured"
+            v-show="view === 'tree'"
+            ref="tree"
+            :has-collection="true"
+            :pages-url="structurePagesUrl"
+            :submit-url="structureSubmitUrl"
+            :max-depth="structureMaxDepth"
+            :expects-root="structureExpectsRoot"
+            :site="site"
+            @changed="markTreeDirty"
+            @saved="markTreeClean"
+            @canceled="markTreeClean"
+        />
+
+    </div>
+
+</template>
+
+<script>
+import ListView from './ListView.vue';
+import TreeView from './TreeView.vue';
+import PageTree from '../structures/PageTree.vue';
+
+export default {
+
+    components: {
+        ListView,
+        TreeView,
+        PageTree,
+    },
+
+    props: {
+        title: { type: String, required: true },
+        handle: { type: String, required: true },
+        canCreate: { type: Boolean, required: true },
+        createUrl: { type: String, required: true },
+        blueprints: { type: Array, required: true },
+        breadcrumbUrl: { type: String, required: true },
+        structured: { type: Boolean, required: true },
+        sortColumn: { type: String, required: true },
+        sortDirection: { type: String, required: true },
+        filters: { type: Array, required: true },
+        actionUrl: { type: String, required: true },
+        reorderable: { type: Boolean, required: true },
+        reorderUrl: { type: String, required: true },
+        blueprints: { type: Array, required: true },
+        site: { type: String, required: true },
+        structurePagesUrl: { type: String },
+        structureSubmitUrl: { type: String },
+        structureMaxDepth: { type: Number, default: Infinity },
+        structureExpectsRoot: { type: Boolean },
+    },
+
+    data() {
+        return {
+            mounted: false,
+            view: this.initialView(),
+        }
+    },
+
+    computed: {
+
+        treeIsDirty() {
+            return this.$dirty.has('page-tree');
+        }
+
+    },
+
+    watch: {
+
+        view: {
+            immediate: true,
+            handler(view) {
+                this.$config.set('wrapperClass', view === 'tree' ? undefined : 'max-w-full');
+
+                localStorage.setItem('statamic.collection-view.'+this.handle, view);
+            }
+        }
+
+    },
+
+    mounted() {
+        this.mounted = true;
+    },
+
+    methods: {
+
+        cancelTreeProgress() {
+            this.$refs.tree.cancel();
+        },
+
+        linkTreePage() {
+            this.$refs.tree.linkPage();
+        },
+
+        linkTreeEntries() {
+            this.$refs.tree.linkToEntries();
+        },
+
+        saveTree() {
+            this.$refs.tree.save();
+        },
+
+        markTreeDirty() {
+            this.$dirty.add('page-tree');
+        },
+
+        markTreeClean() {
+            this.$dirty.remove('page-tree');
+        },
+
+        initialView() {
+            if (!this.structured) return 'list';
+
+            const fallback = this.structured ? 'tree' : 'list';
+
+            return localStorage.getItem('statamic.collection-view.'+this.handle) || fallback;
+        }
+
+    }
+
+}
+</script>
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 2c73e3783cd..9788f1f7d1d 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -1,65 +1,13 @@
 <template>
-    <div class="page-tree">
+    <div>
 
-        <header class="mb-3">
-            <breadcrumb :url="breadcrumbUrl" :title="__('Structures')" />
-
-            <div class="flex items-center">
-                <h1 class="flex-1" v-text="title" />
-
-                <dropdown-list class="mr-1">
-                    <dropdown-item :text="__('Edit Structure Config')" :redirect="editUrl" />
-                </dropdown-list>
-
-                <a @click="cancel" class="text-2xs text-blue mr-2 underline" v-if="isDirty" v-text="__('Discard changes')" />
-
-                <dropdown-list>
-                    <template #trigger>
-                        <button class="btn" v-text="`${__('Add Link')}`" />
-                    </template>
-                    <dropdown-item :text="__('Link to URL')" @click="linkPage" />
-                    <dropdown-item :text="__('Link to Entry')" @click="linkToEntries" />
-                </dropdown-list>
-
-                <create-entry-button
-                    v-if="hasCollection"
-                    class="ml-2"
-                    :url="createEntryUrl()"
-                    :blueprints="collectionBlueprints"
-                    :text="__('Create Page')" />
-
-                <button
-                    class="btn-primary ml-2"
-                    :class="{ 'disabled': !changed }"
-                    :disabled="!changed"
-                    @click="save"
-                    v-text="__('Save Changes')" />
-            </div>
-        </header>
-
-        <loading-graphic v-if="loading"></loading-graphic>
-
-        <div class="" v-if="localizations.length > 1">
-            <div
-                v-for="option in localizations"
-                :key="option.handle"
-                class="revision-item flex items-center border-grey-30"
-                :class="{ 'opacity-50': !option.active }"
-                @click="localizationSelected(option)"
-            >
-                <div class="flex-1 flex items-center">
-                    <span class="little-dot mr-1 bg-green" />
-                    {{ option.name }}
-                </div>
-                <div class="badge bg-orange" v-if="option.origin" v-text="__('Origin')" />
-                <div class="badge bg-blue" v-if="option.active" v-text="__('Active')" />
-                <div class="badge bg-purple" v-if="option.root && !option.origin && !option.active" v-text="__('Root')" />
-            </div>
+        <div class="loading card" v-if="loading">
+            <loading-graphic />
         </div>
 
-        <div v-if="pages.length == 0" class="no-results border-dashed border-2 w-full flex items-center">
+        <div v-if="!loading && pages.length == 0" class="no-results border-dashed border-2 w-full flex items-center">
             <div class="text-center max-w-md mx-auto rounded-lg px-4 py-4">
-                <slot name="no-pages-svg" />
+                <svg-icon name="empty/structure" class="w-24 h-auto mx-auto" />
                 <h1 class="my-3" v-text="__('Create your first link now')" />
                 <p class="text-grey mb-3">
                     {{ __('messages.structures_empty') }}
@@ -75,7 +23,7 @@
             </div>
         </div>
 
-        <div class="page-tree w-full" v-show="pages.length">
+        <div class="page-tree w-full">
             <draggable-tree
                 draggable
                 ref="tree"
@@ -144,37 +92,28 @@ export default {
     },
 
     props: {
-        title: String,
-        breadcrumbUrl: String,
-        initialPages: Array,
-        pagesUrl: String,
-        submitUrl: String,
-        editUrl: String,
-        createUrl: String,
-        soundDropUrl: String,
-        site: String,
-        localizations: Array,
-        collections: Array,
-        maxDepth: {
-            type: Number,
-            default: Infinity,
-        },
-        expectsRoot: Boolean,
-        hasCollection: Boolean,
-        collectionBlueprints: Array,
+        pagesUrl: { type: String, required: true },
+        submitUrl: { type: String, required: true },
+        createUrl: { type: String },
+        site: { type: String, required: true },
+        localizations: { type: Array },
+        collections: { type: Array, default: () => [] },
+        maxDepth: { type: Number, default: Infinity, },
+        expectsRoot: { type: Boolean, required: true },
+        hasCollection: { type: Boolean, required: true },
     },
 
     data() {
         return {
             loading: false,
             saving: false,
-            changed: false,
-            pages: this.initialPages,
+            pages: [],
             treeData: [],
             pageIds: [],
             parentPageForAdding: null,
             targetPage: null,
             creatingPage: false,
+            soundDropUrl: this.$config.get('resourceUrl') + '/audio/click.mp3',
         }
     },
 
@@ -184,10 +123,6 @@ export default {
             return _.findWhere(this.localizations, { active: true });
         },
 
-        isDirty() {
-            return this.$dirty.has('page-tree');
-        },
-
         exclusions() {
             return this.hasCollection ? this.pageIds : [];
         }
@@ -196,16 +131,7 @@ export default {
 
     watch: {
 
-        changed(changed) {
-            this.$dirty.state('page-tree', changed);
-        },
-
-        expectsRoot(value) {
-            this.changed = true;
-        },
-
         pages: {
-            immediate: true,
             deep: true,
             handler(pages) {
                 this.pageIds = this.getPageIds(pages);
@@ -215,7 +141,9 @@ export default {
     },
 
     created() {
-        this.updateTreeData();
+        this.getPages().then(() => {
+            this.initialPages = this.pages;
+        })
 
         this.$keys.bindGlobal(['mod+s'], e => {
             e.preventDefault();
@@ -229,7 +157,7 @@ export default {
             this.loading = true;
             const url = this.pagesUrl;
 
-            this.$axios.get(url).then(response => {
+            return this.$axios.get(url).then(response => {
                 this.pages = response.data.pages;
                 this.updateTreeData();
                 this.loading = false;
@@ -256,7 +184,7 @@ export default {
 
             this.pages = tree.getPureData();
             this.$refs.soundDrop.play();
-            this.changed = true;
+            this.$emit('changed');
         },
 
         save() {
@@ -264,9 +192,10 @@ export default {
             const payload = { pages: this.pages, site: this.site, expectsRoot: this.expectsRoot };
 
             this.$axios.post(this.submitUrl, payload).then(response => {
-                this.changed = false;
+                this.$emit('saved');
                 this.saving = false;
                 this.$toast.success(__('Saved'));
+                this.initialPages = this.pages;
             });
         },
 
@@ -296,7 +225,7 @@ export default {
 
         pageRemoved(tree) {
             this.pages = tree.getPureData();
-            this.changed = true;
+            this.$emit('changed');
         },
 
         localizationSelected(localization) {
@@ -318,12 +247,11 @@ export default {
         },
 
         cancel() {
-            if (!this.isDirty) return;
             if (! confirm('Are you sure?')) return;
 
             this.pages = this.initialPages;
             this.updateTreeData();
-            this.changed = false;
+            this.$emit('canceled');
         },
 
         treeDragstart(node) {
@@ -396,7 +324,7 @@ export default {
 
         pageUpdated(tree) {
             this.pages = tree.getPureData();
-            this.changed = true;
+            this.$emit('changed');
         },
 
         makeFirstPage() {
diff --git a/resources/js/components/structures/View.vue b/resources/js/components/structures/View.vue
new file mode 100644
index 00000000000..cda2e93f3e5
--- /dev/null
+++ b/resources/js/components/structures/View.vue
@@ -0,0 +1,101 @@
+<template>
+
+    <div>
+
+        <header class="mb-3" v-if="mounted">
+            <breadcrumb :url="breadcrumbUrl" :title="__('Structures')" />
+
+            <div class="flex items-center">
+                <h1 class="flex-1" v-text="title" />
+
+                <dropdown-list class="mr-1">
+                    <dropdown-item :text="__('Edit Structure Config')" :redirect="editUrl" />
+                </dropdown-list>
+
+                <a @click="$refs.tree.cancel" class="text-2xs text-blue mr-2 underline" v-if="isDirty" v-text="__('Discard changes')" />
+
+                <dropdown-list>
+                    <template #trigger>
+                        <button class="btn" v-text="`${__('Add Link')}`" />
+                    </template>
+                    <dropdown-item :text="__('Link to URL')" @click="$refs.tree.linkPage" />
+                    <dropdown-item :text="__('Link to Entry')" @click="$refs.tree.linkToEntries" />
+                </dropdown-list>
+
+                <button
+                    class="btn-primary ml-2"
+                    :class="{ 'disabled': !changed }"
+                    :disabled="!changed"
+                    @click="$refs.tree.save"
+                    v-text="__('Save Changes')" />
+            </div>
+        </header>
+
+        <page-tree
+            ref="tree"
+            :collections="collections"
+            :has-collection="false"
+            :pages-url="pagesUrl"
+            :submit-url="submitUrl"
+            :max-depth="maxDepth"
+            :expects-root="expectsRoot"
+            :site="site"
+            @changed="changed = true"
+            @saved="changed = false"
+            @canceled="changed = false"
+        />
+
+    </div>
+
+</template>
+
+<script>
+import PageTree from './PageTree.vue';
+
+export default {
+
+    components: {
+        PageTree
+    },
+
+    props: {
+        title: { type: String, required: true },
+        collections: { type: Array, required: true },
+        breadcrumbUrl: { type: String, required: true },
+        editUrl: { type: String, required: true },
+        pagesUrl: { type: String, required: true },
+        submitUrl: { type: String, required: true },
+        maxDepth: { type: Number, default: Infinity, },
+        expectsRoot: { type: Boolean, required: true },
+        site: { type: String, required: true },
+    },
+
+    data() {
+        return {
+            mounted: false,
+            changed: false,
+        }
+    },
+
+    computed: {
+
+        isDirty() {
+            return this.$dirty.has('page-tree');
+        }
+
+    },
+
+    watch: {
+
+        changed(changed) {
+            this.$dirty.state('page-tree', changed);
+        }
+
+    },
+
+    mounted() {
+        this.mounted = true;
+    }
+
+}
+</script>
diff --git a/resources/views/collections/empty.blade.php b/resources/views/collections/empty.blade.php
index 8290bc95297..b20a2d91961 100644
--- a/resources/views/collections/empty.blade.php
+++ b/resources/views/collections/empty.blade.php
@@ -22,7 +22,7 @@
                 <p>{{ __('statamic::messages.collection_next_steps_configure_description') }}</p>
             </div>
         </a>
-        <a href="{{ cp_route('collections.entries.create', [$collection->handle(), $site->handle()]) }}" class="w-full lg:w-1/2 p-3 border-t lg:border-none md:flex items-start hover:bg-grey-10 group">
+        <a href="{{ cp_route('collections.entries.create', [$collection->handle(), $site]) }}" class="w-full lg:w-1/2 p-3 border-t lg:border-none md:flex items-start hover:bg-grey-10 group">
             <div class="h-8 w-8 mr-2 hidden md:block text-grey-80">
                 @svg('content-writing')
             </div>
@@ -53,25 +53,3 @@
 </div>
 
 @stop
-
-
-@section('xcontent')
-
-    <div class="max-w-lg mt-2 mx-auto">
-        <div class="rounded p-3 shadow bg-white">
-            <header class="border-b-2 border-grey-20 mb-3 pb-2">
-                <h1>Next steps for {{ $collection->title() }}</h1>
-            </header>
-            <div class="">
-                <p class="text-grey-70">By default, collections don't have defined URLs, blueprints, or dates.
-                Configure your collection to set these and other options.</p>
-            </div>
-        </div>
-    </div>
-
-    <create-entry-button
-        url="{{ cp_route('collections.entries.create', [$collection->handle(), $site->handle()]) }}"
-        :blueprints="{{ $blueprints->toJson() }}">
-    </create-entry-button>
-
-@endsection
diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index 304e79ff52b..23e36014dbd 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -3,50 +3,47 @@
 @section('wrapper_class', 'max-w-full')
 
 @section('content')
-    <header class="mb-3">
-        @include('statamic::partials.breadcrumb', [
-            'url' => cp_route('collections.index'),
-            'title' => __('Collections')
-        ])
-        <div class="flex items-center">
-            <h1 class="flex-1">{{ $collection->title() }}</h1>
-            <dropdown-list class="mr-1">
-                @can('edit', $collection)
-                    <dropdown-item :text="__('Edit Collection')" redirect="{{ $collection->editUrl() }}"></dropdown-item>
-                @endcan
-                @can('edit', $collection)
-                    <dropdown-item :text="__('Scaffold Resources')" redirect="{{ cp_route('collections.scaffold', $collection->handle()) }}"></dropdown-item>
-                @endcan
-                @can('delete', $collection)
-                    <dropdown-item :text="__('Delete Collection')" class="warning" @click="$refs.deleter.confirm()">
-                        <resource-deleter
-                            ref="deleter"
-                            resource-title="{{ $collection->title() }}"
-                            route="{{ cp_route('collections.destroy', $collection->handle()) }}"
-                            redirect="{{ cp_route('collections.index') }}"
-                        ></resource-deleter>
-                    </dropdown-item>
-                @endcan
-            </dropdown-list>
-            @can('create', ['Statamic\Contracts\Entries\Entry', $collection])
-                <create-entry-button
-                    button-class="btn-primary"
-                    url="{{ cp_route('collections.entries.create', [$collection->handle(), $site->handle()]) }}"
-                    :blueprints="{{ $blueprints->toJson() }}">
-                </create-entry-button>
-            @endcan
-        </div>
-    </header>
-
-    <entry-list
-        collection="{{ $collection->handle() }}"
-        initial-sort-column="{{ $collection->sortField() }}"
-        initial-sort-direction="{{ $collection->sortDirection() }}"
+    <collection-view
+        :structured="{{ Statamic\Support\Str::bool($collection->hasStructure()) }}"
+        title="{{ $collection->title() }}"
+        handle="{{ $collection->handle() }}"
+        breadcrumb-url="{{ cp_route('collections.index') }}"
+        :can-create="@can('create', ['Statamic\Contracts\Entries\Entry', $collection]) true @else false @endcan"
+        create-url="{{ cp_route('collections.entries.create', [$collection->handle(), $site]) }}"
+        :blueprints='@json($blueprints)'
+        sort-column="{{ $collection->sortField() }}"
+        sort-direction="{{ $collection->sortDirection() }}"
         :filters="{{ $filters->toJson() }}"
         action-url="{{ cp_route('collections.entries.actions', $collection->handle()) }}"
         :reorderable="{{ Statamic\Support\Str::bool($collection->orderable() && $user->can('reorder', $collection)) }}"
         reorder-url="{{ cp_route('collections.entries.reorder', $collection->handle()) }}"
-        structure-url="{{ optional($collection->structure())->showUrl() }}"
-    ></entry-list>
+        site="{{ $site }}"
+
+        @if ($collection->hasStructure())
+        structure-pages-url="{{ cp_route('structures.pages.index', $structure->handle()) }}"
+        structure-submit-url="{{ cp_route('structures.pages.store', $structure->handle()) }}"
+        :structure-max-depth="{{ $structure->maxDepth() ?? 'Infinity' }}"
+        :structure-expects-root="{{ Statamic\Support\Str::bool($structure->expectsRoot()) }}"
+        @endif
+    >
+        <template #twirldown>
+            @can('edit', $collection)
+                <dropdown-item :text="__('Edit Collection')" redirect="{{ $collection->editUrl() }}"></dropdown-item>
+            @endcan
+            @can('edit', $collection)
+                <dropdown-item :text="__('Scaffold Resources')" redirect="{{ cp_route('collections.scaffold', $collection->handle()) }}"></dropdown-item>
+            @endcan
+            @can('delete', $collection)
+                <dropdown-item :text="__('Delete Collection')" class="warning" @click="$refs.deleter.confirm()">
+                    <resource-deleter
+                        ref="deleter"
+                        resource-title="{{ $collection->title() }}"
+                        route="{{ cp_route('collections.destroy', $collection->handle()) }}"
+                        redirect="{{ cp_route('collections.index') }}"
+                    ></resource-deleter>
+                </dropdown-item>
+            @endcan
+        </template>
+    </collection-view>
 
 @endsection
diff --git a/resources/views/structures/show.blade.php b/resources/views/structures/show.blade.php
index 5562eb33348..8c159667393 100644
--- a/resources/views/structures/show.blade.php
+++ b/resources/views/structures/show.blade.php
@@ -4,38 +4,16 @@
 
 @section('content')
 
-    <page-tree
+    <structure-view
         title="{{ $structure->title() }}"
         breadcrumb-url="{{ cp_route('structures.index') }}"
-        :initial-pages="{{ json_encode($pages) }}"
         pages-url="{{ cp_route('structures.pages.index', $structure->handle()) }}"
         submit-url="{{ cp_route('structures.pages.store', $structure->handle()) }}"
         edit-url="{{ cp_route('structures.edit', $structure->handle()) }}"
-        create-url="{{ $hasCollection ? cp_route('collections.entries.create', [$structure->collection()->handle(), $site]) : null }}"
-        sound-drop-url="{{ Statamic::cpAssetUrl('audio/click.mp3') }}"
         site="{{ $site }}"
-        :localizations="{{ json_encode($localizations) }}"
         :collections="{{ json_encode($collections) }}"
         :max-depth="{{ $structure->maxDepth() ?? 'Infinity' }}"
         :expects-root="{{ $str::bool($expectsRoot) }}"
-        :has-collection="{{ $str::bool($hasCollection) }}"
-        :collection-blueprints="{{ $collectionBlueprints->toJson() }}"
-    >
-        <template slot="header">
-            <div>
-                @include('statamic::partials.breadcrumb', [
-                    'url' => cp_route('structures.index'),
-                    'title' => __('Structures')
-                ])
-                <h1 class="flex-1">
-                    {{ $structure->title() }}
-                </h1>
-            </div>
-        </template>
-
-        <template slot="no-pages-svg">
-            @svg('empty/structure')
-        </template>
-    </page-tree>
+    ></structure-view>
 
 @endsection
diff --git a/src/Contracts/Structures/StructureRepository.php b/src/Contracts/Structures/StructureRepository.php
index a5d3e41f20c..48dd214ee17 100644
--- a/src/Contracts/Structures/StructureRepository.php
+++ b/src/Contracts/Structures/StructureRepository.php
@@ -13,4 +13,5 @@ public function find($id): ?Structure;
     public function findByHandle($handle): ?Structure;
     public function findEntryByUri(string $uri, string $site = null): ?Entry;
     public function save(Structure $structure);
+    public function make(string $handle = null): Structure;
 }
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index a0408399c15..c2e9d5b0392 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -45,12 +45,10 @@ public function index()
         ]);
     }
 
-    public function show($collection)
+    public function show(Request $request, $collection)
     {
         $this->authorize('view', $collection, 'You are not authorized to view this collection.');
 
-        $view = $collection->queryEntries()->count() ? 'show' : 'empty';
-
         $blueprints = $collection->entryBlueprints()->map(function ($blueprint) {
             return [
                 'handle' => $blueprint->handle(),
@@ -58,15 +56,47 @@ public function show($collection)
             ];
         });
 
-        return view("statamic::collections.{$view}", [
+        $site = $request->site ? Site::get($request->site) : Site::selected();
+
+        $viewData = [
             'collection' => $collection,
             'blueprints' => $blueprints,
-            'site' => Site::selected(),
+            'site' => $site->handle(),
             'filters' => Scope::filters('entries', [
                 'collection' => $collection->handle(),
                 'blueprints' => $blueprints->pluck('handle')->all(),
             ]),
-        ]);
+        ];
+
+        if ($collection->queryEntries()->count() === 0) {
+            return view('statamic::collections.empty', $viewData);
+        }
+
+        if (! $collection->hasStructure()) {
+            return view('statamic::collections.show', $viewData);
+        }
+
+        $structure = $collection->structure();
+        $tree = $structure->in($site->handle());
+
+        return view('statamic::collections.show', array_merge($viewData, [
+            'structure' => $structure,
+            'expectsRoot' => $structure->expectsRoot(),
+            'localizations' => $structure->sites()->map(function ($handle) use ($structure, $tree) {
+                $localized = $structure->in($handle);
+                $exists = $localized !== null;
+                if (!$exists) {
+                    return null;
+                }
+                return [
+                    'handle' => $handle,
+                    'name' => Site::get($handle)->name(),
+                    'active' => $handle === $tree->locale(),
+                    'exists' => $exists,
+                    'url' => $exists ? $localized->editUrl() : null,
+                ];
+            })->filter()->all()
+        ]));
     }
 
     public function create()
diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/StructuresController.php
index 54501ebd510..1b0851c8ab2 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/StructuresController.php
@@ -90,12 +90,6 @@ public function show(Request $request, $structure)
             return abort(404);
         }
 
-        $pages = (new TreeBuilder)->buildForController([
-            'structure' => $structure->handle(),
-            'include_home' => true,
-            'site' => $site,
-        ]);
-
         $blueprints = $structure->isCollectionBased()
             ? $structure->collection()->entryBlueprints()->map(function ($blueprint) {
                 return [
@@ -107,7 +101,6 @@ public function show(Request $request, $structure)
         return view('statamic::structures.show', [
             'site' => $site,
             'structure' => $structure,
-            'pages' => $pages,
             'expectsRoot' => $structure->expectsRoot(),
             'hasCollection' => $structure->isCollectionBased(),
             'collections' => $structure->collections()->map->handle()->all(),
diff --git a/src/Stache/Repositories/StructureRepository.php b/src/Stache/Repositories/StructureRepository.php
index 46c24851918..977e5169377 100644
--- a/src/Stache/Repositories/StructureRepository.php
+++ b/src/Stache/Repositories/StructureRepository.php
@@ -62,9 +62,9 @@ public function delete(Structure $structure)
         $this->store->delete($structure);
     }
 
-    public function make()
+    public function make(string $handle = null): Structure
     {
-        return new \Statamic\Structures\Structure;
+        return (new \Statamic\Structures\Structure)->handle($handle);
     }
 
     public function updateEntryUris(Structure $structure)
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index e94454821aa..88cb1aa05a3 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -34,7 +34,7 @@ public function id()
 
     public function handle($handle = null)
     {
-        if (is_null($handle)) {
+        if (func_num_args() === 0) {
             return $this->handle;
         }
 
diff --git a/tests/FakesRoles.php b/tests/FakesRoles.php
index eea0185f794..3d8194fbf9d 100644
--- a/tests/FakesRoles.php
+++ b/tests/FakesRoles.php
@@ -10,7 +10,7 @@
 
 trait FakesRoles
 {
-    private function setTestRoles($roles)
+    protected function setTestRoles($roles)
     {
         $roles = collect($roles)
             ->map(function ($permissions, $handle) {
diff --git a/tests/Feature/Collections/ShowCollectionTest.php b/tests/Feature/Collections/ShowCollectionTest.php
new file mode 100644
index 00000000000..ef5019dae5d
--- /dev/null
+++ b/tests/Feature/Collections/ShowCollectionTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Feature\Collections;
+
+use Facades\Tests\Factories\EntryFactory;
+use Tests\TestCase;
+use Tests\FakesRoles;
+use Statamic\Facades\User;
+use Statamic\Facades\Collection;
+use Tests\PreventSavingStacheItemsToDisk;
+
+abstract class ShowCollectionTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    function it_shows_the_empty_entry_listing_page_if_you_have_permission_and_there_are_no_entries()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'view test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = $this->createCollection('test');
+
+        $this
+            ->actingAs($user)
+            ->get($collection->showUrl())
+            ->assertOk()
+            ->assertViewIs('statamic::collections.empty');
+    }
+
+    /** @test */
+    function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = $this->createCollection('test');
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->get($collection->showUrl())
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+    }
+
+    abstract function createCollection($handle);
+}
diff --git a/tests/Feature/Collections/ShowRegularCollectionTest.php b/tests/Feature/Collections/ShowRegularCollectionTest.php
index 6401b64c982..08be3995c1f 100644
--- a/tests/Feature/Collections/ShowRegularCollectionTest.php
+++ b/tests/Feature/Collections/ShowRegularCollectionTest.php
@@ -3,23 +3,25 @@
 namespace Tests\Feature\Collections;
 
 use Facades\Tests\Factories\EntryFactory;
-use Tests\TestCase;
-use Tests\FakesRoles;
 use Statamic\Facades\User;
 use Statamic\Facades\Collection;
 use Tests\PreventSavingStacheItemsToDisk;
 
-class ShowRegularCollectionTest extends TestCase
+class ShowRegularCollectionTest extends ShowCollectionTest
 {
-    use FakesRoles;
     use PreventSavingStacheItemsToDisk;
 
+    function createCollection($handle)
+    {
+        return tap(Collection::make('test'))->save();
+    }
+
     /** @test */
     function it_shows_the_entry_listing_page_if_you_have_permission()
     {
         $this->setTestRoles(['test' => ['access cp', 'view test entries']]);
         $user = tap(User::make()->assignRole('test'))->save();
-        $collection = tap(Collection::make('test'))->save();
+        $collection = $this->createCollection('test');
         EntryFactory::id('1')->collection($collection)->create();
 
         $this
@@ -29,33 +31,4 @@ function it_shows_the_entry_listing_page_if_you_have_permission()
             ->assertViewIs('statamic::collections.show')
             ->assertViewHas('collection', $collection);
     }
-
-    /** @test */
-    function it_shows_the_empty_entry_listing_page_if_you_have_permission_and_there_are_no_entries()
-    {
-        $this->setTestRoles(['test' => ['access cp', 'view test entries']]);
-        $user = tap(User::make()->assignRole('test'))->save();
-        $collection = tap(Collection::make('test'))->save();
-
-        $this
-            ->actingAs($user)
-            ->get($collection->showUrl())
-            ->assertOk()
-            ->assertViewIs('statamic::collections.empty');
-    }
-
-    /** @test */
-    function it_denies_access_if_you_dont_have_permission()
-    {
-        $this->setTestRoles(['test' => ['access cp']]);
-        $user = tap(User::make()->assignRole('test'))->save();
-        $collection = tap(Collection::make('test'))->save();
-
-        $this
-            ->from('/original')
-            ->actingAs($user)
-            ->get($collection->showUrl())
-            ->assertRedirect('/original')
-            ->assertSessionHas('error');
-    }
 }
diff --git a/tests/Feature/Collections/ShowStructuredCollectionTest.php b/tests/Feature/Collections/ShowStructuredCollectionTest.php
new file mode 100644
index 00000000000..0aff16d18a2
--- /dev/null
+++ b/tests/Feature/Collections/ShowStructuredCollectionTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Tests\Feature\Collections;
+
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Facades\User;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Structure;
+use Tests\PreventSavingStacheItemsToDisk;
+
+class ShowStructuredCollectionTest extends ShowCollectionTest
+{
+    use PreventSavingStacheItemsToDisk;
+
+    function createCollection($handle)
+    {
+        tap(Structure::make('test'), function ($s) {
+            $s->addTree($s->makeTree('en'));
+        })->save();
+
+        return tap(Collection::make('test')->structure('test'))->save();
+    }
+
+    /** @test */
+    function it_shows_the_structure_tree_if_you_have_permission()
+    {
+        $this->withoutExceptionHandling();
+        $this->setTestRoles(['test' => ['access cp', 'view test entries']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = $this->createCollection('test');
+        EntryFactory::id('1')->collection($collection)->create();
+
+        $this
+            ->actingAs($user)
+            ->get($collection->showUrl())
+            ->assertOk()
+            ->assertViewIs('statamic::collections.show')
+            ->assertViewHas('collection', $collection)
+            ->assertViewHas('structure', $collection->structure());
+    }
+}

From 9b33b221fb9c84bf0c62610a23d7d6cae7447929 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 20 Feb 2020 11:42:51 -0500
Subject: [PATCH 010/137] Nav only shows non-collection structures

---
 src/CP/Navigation/CoreNav.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/CP/Navigation/CoreNav.php b/src/CP/Navigation/CoreNav.php
index c63fc9bcd5e..7b3a5a8ec37 100644
--- a/src/CP/Navigation/CoreNav.php
+++ b/src/CP/Navigation/CoreNav.php
@@ -84,7 +84,9 @@ protected function makeContentSection()
             ->icon('hierarchy-files')
             ->can('index', Structure::class)
             ->children(function () {
-                return StructureAPI::all()->map(function ($structure) {
+                return StructureAPI::all()->reject(function ($structure) {
+                    return $structure->isCollectionBased();
+                })->map(function ($structure) {
                     return Nav::item($structure->title())
                               ->url($structure->showUrl())
                               ->can('view', $structure);

From a6a6eff4ed8306cc1ff6e1fa1febb2d6d1221839 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 20 Feb 2020 12:01:31 -0500
Subject: [PATCH 011/137] Remove old unused imported components

---
 resources/js/components/collections/View.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 3e1167614ff..77557af2265 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -87,15 +87,11 @@
 </template>
 
 <script>
-import ListView from './ListView.vue';
-import TreeView from './TreeView.vue';
 import PageTree from '../structures/PageTree.vue';
 
 export default {
 
     components: {
-        ListView,
-        TreeView,
         PageTree,
     },
 

From 9cae34268c7bcdb2c8150c43a09b25e50f826a44 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 20 Feb 2020 12:52:01 -0500
Subject: [PATCH 012/137] Initial renaming of structures to navigation

---
 resources/js/components/structures/EditForm.vue | 2 +-
 resources/js/components/structures/View.vue     | 4 ++--
 resources/js/components/structures/Wizard.vue   | 2 +-
 resources/views/structures/edit.blade.php       | 2 +-
 resources/views/structures/index.blade.php      | 6 +++---
 resources/views/structures/show.blade.php       | 2 +-
 src/CP/Navigation/CoreNav.php                   | 2 +-
 tests/Facades/NavTest.php                       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/js/components/structures/EditForm.vue b/resources/js/components/structures/EditForm.vue
index 1370c4395f0..3073bcdd3df 100644
--- a/resources/js/components/structures/EditForm.vue
+++ b/resources/js/components/structures/EditForm.vue
@@ -13,7 +13,7 @@
     >
         <div slot-scope="{ setFieldValue }">
             <header class="mb-3">
-                <breadcrumb :url="listingUrl" :title="__('Structures')" />
+                <breadcrumb :url="listingUrl" :title="__('Navigation')" />
                 <div class="flex items-center">
                     <h1 class="flex-1">
                         {{ title }}
diff --git a/resources/js/components/structures/View.vue b/resources/js/components/structures/View.vue
index cda2e93f3e5..c864fdcdf99 100644
--- a/resources/js/components/structures/View.vue
+++ b/resources/js/components/structures/View.vue
@@ -3,13 +3,13 @@
     <div>
 
         <header class="mb-3" v-if="mounted">
-            <breadcrumb :url="breadcrumbUrl" :title="__('Structures')" />
+            <breadcrumb :url="breadcrumbUrl" :title="__('Navigation')" />
 
             <div class="flex items-center">
                 <h1 class="flex-1" v-text="title" />
 
                 <dropdown-list class="mr-1">
-                    <dropdown-item :text="__('Edit Structure Config')" :redirect="editUrl" />
+                    <dropdown-item :text="__('Edit Navigation Config')" :redirect="editUrl" />
                 </dropdown-list>
 
                 <a @click="$refs.tree.cancel" class="text-2xs text-blue mr-2 underline" v-if="isDirty" v-text="__('Discard changes')" />
diff --git a/resources/js/components/structures/Wizard.vue b/resources/js/components/structures/Wizard.vue
index 84745a55612..9a2d9d3bffd 100644
--- a/resources/js/components/structures/Wizard.vue
+++ b/resources/js/components/structures/Wizard.vue
@@ -12,7 +12,7 @@
         <!-- Step 1 -->
         <div v-if="currentStep === 0">
             <div class="max-w-md mx-auto px-2 py-6 text-center">
-                <h1 class="mb-3" v-text="__('Structures')" />
+                <h1 class="mb-3" v-text="__('Navigation')" />
                 <p class="text-grey">
                     {{ __('messages.structure_wizard_description') }}
                 </p>
diff --git a/resources/views/structures/edit.blade.php b/resources/views/structures/edit.blade.php
index e9078594b49..abd2b849eec 100644
--- a/resources/views/structures/edit.blade.php
+++ b/resources/views/structures/edit.blade.php
@@ -1,5 +1,5 @@
 @extends('statamic::layout')
-@section('title', __('Edit Structure'))
+@section('title', __('Edit Navigation'))
 
 @section('content')
 
diff --git a/resources/views/structures/index.blade.php b/resources/views/structures/index.blade.php
index ca8459aecd2..69d36b43704 100644
--- a/resources/views/structures/index.blade.php
+++ b/resources/views/structures/index.blade.php
@@ -1,15 +1,15 @@
 @extends('statamic::layout')
-@section('title', __('Structures'))
+@section('title', __('Navigation'))
 
 @section('content')
 
     @unless($structures->isEmpty())
 
         <header class="flex items-center justify-between mb-3">
-            <h1>{{ __('Structures') }}</h1>
+            <h1>{{ __('Navigation') }}</h1>
 
             @can('create', 'Statamic\Contracts\Structures\Structure')
-                <a href="{{ cp_route('structures.create') }}" class="btn-primary">{{ __('Create Structure') }}</a>
+                <a href="{{ cp_route('structures.create') }}" class="btn-primary">{{ __('Create Navigation') }}</a>
             @endcan
         </header>
 
diff --git a/resources/views/structures/show.blade.php b/resources/views/structures/show.blade.php
index 8c159667393..b3280886e3e 100644
--- a/resources/views/structures/show.blade.php
+++ b/resources/views/structures/show.blade.php
@@ -1,6 +1,6 @@
 @inject('str', 'Statamic\Support\Str')
 @extends('statamic::layout')
-@section('title', Statamic::crumb($structure->title(), 'Structures'))
+@section('title', Statamic::crumb($structure->title(), 'Navigation'))
 
 @section('content')
 
diff --git a/src/CP/Navigation/CoreNav.php b/src/CP/Navigation/CoreNav.php
index 7b3a5a8ec37..5ede2d9cfaa 100644
--- a/src/CP/Navigation/CoreNav.php
+++ b/src/CP/Navigation/CoreNav.php
@@ -79,7 +79,7 @@ protected function makeContentSection()
                 });
             });
 
-        Nav::content('Structures')
+        Nav::content('Navigation')
             ->route('structures.index')
             ->icon('hierarchy-files')
             ->can('index', Structure::class)
diff --git a/tests/Facades/NavTest.php b/tests/Facades/NavTest.php
index 984cfa4b3bd..d90b91d3bd8 100644
--- a/tests/Facades/NavTest.php
+++ b/tests/Facades/NavTest.php
@@ -30,7 +30,7 @@ function it_can_build_a_default_nav()
     {
         $expected = collect([
             'Top Level' => ['Dashboard', 'Playground'],
-            'Content' => ['Collections', 'Structures', 'Taxonomies', 'Assets', 'Globals'],
+            'Content' => ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals'],
             'Tools' => ['Forms', /*'Updates',*/ 'Utilities'],
             'Users' => ['Users', 'Groups', 'Permissions'],
             'Site' => [/*'Addons',*/ 'Fields']

From 9230a27f08562977376d27df0f27eeff3211de4a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 20 Feb 2020 12:52:24 -0500
Subject: [PATCH 013/137] Change first page to first link

---
 resources/js/components/structures/PageTree.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 9788f1f7d1d..0ec80640431 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -12,14 +12,14 @@
                 <p class="text-grey mb-3">
                     {{ __('messages.structures_empty') }}
                 </p>
-                <button v-if="!hasCollection" class="btn-primary btn-lg" v-text="__('Create first page')" @click="openPageCreator" />
+                <button v-if="!hasCollection" class="btn-primary btn-lg" v-text="__('Create first link')" @click="openPageCreator" />
 
                 <create-entry-button
                     v-if="hasCollection"
                     button-class="btn-primary"
                     :url="createEntryUrl()"
                     :blueprints="collectionBlueprints"
-                    :text="__('Create first page')" />
+                    :text="__('Create first link')" />
             </div>
         </div>
 

From eb662d5dcda472bf6b290a21e9e2c7643a8c8f14 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 20 Feb 2020 13:26:26 -0500
Subject: [PATCH 014/137] Remove collection-structure specific fields and logic
 from edit and update. Adjust to the new config UX.

---
 .../js/components/structures/EditForm.vue     |   2 +-
 .../CP/Structures/StructuresController.php    | 101 ++++++++----------
 2 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/resources/js/components/structures/EditForm.vue b/resources/js/components/structures/EditForm.vue
index 3073bcdd3df..5e29488e589 100644
--- a/resources/js/components/structures/EditForm.vue
+++ b/resources/js/components/structures/EditForm.vue
@@ -22,7 +22,7 @@
             </div>
             </header>
 
-            <publish-sections @updated="setFieldValue" :enable-sidebar="false" />
+            <configure-sections @updated="setFieldValue" :enable-sidebar="false" />
         </div>
     </publish-container>
 
diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/StructuresController.php
index 1b0851c8ab2..2148dd38a67 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/StructuresController.php
@@ -49,8 +49,6 @@ public function edit($structure)
         $values = [
             'title' => $structure->title(),
             'handle' => $structure->handle(),
-            'purpose' => $structure->collection() ? 'collection' : 'navigation',
-            'collection' => optional($structure->collection())->handle(),
             'collections' => $structure->collections()->map->handle()->all(),
             'expects_root' => $structure->expectsRoot(),
             'sites' => Site::all()->map(function ($site) use ($structure) {
@@ -142,9 +140,15 @@ public function update(Request $request, $structure)
             ->title($values['title'])
             ->handle($values['handle'])
             ->expectsRoot($expectsRoot = $values['expects_root'])
-            ->sites(collect($values['sites'])->filter->enabled->map->handle->values()->all());
+            ->collections($values['collections']);
 
-        foreach ($values['sites'] as $site) {
+        $sites = $values['sites'] ?? [];
+
+        if (!empty($sites)) {
+            $structure->sites($sites->filter->enabled->map->handle->values()->all());
+        }
+
+        foreach ($sites as $site) {
             $tree = $structure->in($site['handle']);
 
             if ($tree && !$site['enabled']) {
@@ -162,18 +166,6 @@ public function update(Request $request, $structure)
             $structure->addTree($tree);
         }
 
-        if ($values['purpose'] === 'collection') {
-            $routes = collect($values['sites'])->mapWithKeys(function ($site) {
-                return [$site['handle'] => $site['route']];
-            });
-
-            Collection::findByHandle($values['collection'])
-                ->route(Site::hasMultiple() ? $routes->all() : $routes->first())
-                ->save();
-        } else {
-            $structure->collections($values['collections']);
-        }
-
         $this->updateRootExpectations($structure, $expectedRoot, $expectsRoot);
 
         $structure->save();
@@ -263,50 +255,45 @@ protected function moveRootToFirstPage($tree)
 
     public function editFormBlueprint()
     {
-        return Blueprint::makeFromFields([
-            'title' => [
-                'type' => 'text',
-                'validate' => 'required',
-                'width' => 50,
-            ],
-            'handle' => [
-                'type' => 'slug',
-                'width' => 50,
-                'read_only' => true,
+        $contents = [
+            'name' => [
+                'display' => 'Name',
+                'fields' => [
+                    'title' => [
+                        'type' => 'text',
+                        'validate' => 'required',
+                    ],
+                    'handle' => [
+                        'type' => 'slug',
+                        'read_only' => true,
+                    ],
+                ],
             ],
-            'purpose' => [
-                'type' => 'radio',
-                'instructions' => 'You can use this structure to define the URLs for a collection, you can use it to build an arbitrary navigation.',
-                'options' => [
-                    'collection' => 'Manage a Collection',
-                    'navigation' => 'Build a Navigation',
-                ]
+            'options' => [
+                'display' => 'Options',
+                'fields' => [
+                    'collections' => [
+                        'type' => 'collections',
+                        'display' => 'Collections',
+                        'instructions' => 'You will be able to add links to entries from these collections.',
+                    ],
+                    'expects_root' => [
+                        'type' => 'toggle',
+                        'display' => 'Expect a root page',
+                        'instructions' => 'The first page in the tree should be considered the "root" or "home" page.',
+                    ],
+                ],
             ],
-            'collections' => [
-                'type' => 'collections',
-                'display' => 'Collections',
-                'instructions' => 'You will be able to add links to entries from these collections.',
-                'if' => ['purpose' => 'navigation'],
-            ],
-            'collection' => [
-                'type' => 'collections',
-                'max_items' => 1,
-                'display' => 'Collection',
-                'instructions' => 'The collection this structure will be managing.',
-                'if' => ['purpose' => 'collection'],
-                'validate' => 'required_if:purpose,collection'
-            ],
-            'expects_root' => [
-                'type' => 'toggle',
-                'display' => 'Expect a root page',
-                'instructions' => 'The first page in the tree should be considered the "root" or "home" page.',
-                'if' => ['purpose' => 'collection'],
-            ],
-            'sites' => [
+        ];
+
+        if (Site::hasMultiple()) {
+            $contents['options']['fields']['sites'] = [
                 'type' => 'structure_sites',
-                'display' => Site::hasMultiple() ? __('Sites') : __('Route'),
-            ]
-        ]);
+                'display' => __('Sites'),
+            ];
+        };
+
+        return Blueprint::makeFromSections($contents);
     }
 
     public function destroy($structure)

From 46e7b3f9d029103c1dc9936ae4e9656204465966 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:10:20 -0500
Subject: [PATCH 015/137] Change structure wizard to create form, and just
 store title and handle.

---
 resources/js/app.js                           |   2 +-
 .../js/components/structures/CreateForm.vue   |  80 ++++++
 resources/js/components/structures/Wizard.vue | 229 ------------------
 resources/views/structures/create.blade.php   |   6 +-
 .../CP/Structures/StructuresController.php    |  25 +-
 5 files changed, 86 insertions(+), 256 deletions(-)
 create mode 100644 resources/js/components/structures/CreateForm.vue
 delete mode 100644 resources/js/components/structures/Wizard.vue

diff --git a/resources/js/app.js b/resources/js/app.js
index 3ab09dbd974..0ae306a4f24 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -129,8 +129,8 @@ Statamic.app({
         CollectionEditForm: require('./components/collections/EditForm.vue').default,
         CollectionView: require('./components/collections/View.vue').default,
         SessionExpiry: require('./components/SessionExpiry.vue').default,
-        StructureWizard: require('./components/structures/Wizard.vue').default,
         StructureListing: require('./components/structures/Listing.vue').default,
+        StructureCreateForm: require('./components/structures/CreateForm.vue').default,
         StructureEditForm: require('./components/structures/EditForm.vue').default,
         StructureView: require('./components/structures/View.vue').default,
         Stacks: require('./components/stacks/Stacks.vue').default,
diff --git a/resources/js/components/structures/CreateForm.vue b/resources/js/components/structures/CreateForm.vue
new file mode 100644
index 00000000000..b42901597b6
--- /dev/null
+++ b/resources/js/components/structures/CreateForm.vue
@@ -0,0 +1,80 @@
+<template>
+    <div class="max-w-lg mt-2 mx-auto">
+
+        <div class="rounded p-3 lg:px-7 lg:py-5 shadow bg-white">
+            <header class="text-center mb-6">
+                <h1 class="mb-3">{{ __('Create a new Navigation') }}</h1>
+                <p class="text-grey" v-text="__('messages.navigation_configure_intro')" />
+            </header>
+            <div class="mb-5">
+                <label class="font-bold text-base mb-sm" for="name">{{ __('Title') }}</label>
+                <input type="text" v-model="title" class="input-text" autofocus tabindex="1">
+                <div class="text-2xs text-grey-60 mt-1 flex items-center">
+                    {{ __('messages.navigation_configure_title_instructions') }}
+                </div>
+            </div>
+            <div class="mb-2">
+                <label class="font-bold text-base mb-sm" for="name">{{ __('Handle') }}</label>
+                <input type="text" v-model="handle" class="input-text" tabindex="2">
+                <div class="text-2xs text-grey-60 mt-1 flex items-center">
+                    {{ __('messages.navigation_configure_handle_instructions') }}
+                </div>
+            </div>
+        </div>
+
+        <div class="flex justify-center mt-4">
+            <button tabindex="4" class="btn-primary mx-auto btn-lg" :disabled="! canSubmit" @click="submit">
+                {{ __('Create Navigation')}}
+            </button>
+        </div>
+    </div>
+</template>
+
+<script>
+
+export default {
+
+    props: {
+        route: {
+            type: String
+        }
+    },
+
+    data() {
+        return {
+            title: null,
+            handle: null,
+        }
+    },
+
+    watch: {
+        'title': function(val) {
+            this.handle = this.$slugify(val, '_');
+        }
+    },
+
+    computed: {
+        canSubmit() {
+            return Boolean(this.title && this.handle);
+        },
+    },
+
+    methods: {
+        submit() {
+            this.$axios.post(this.route, {title: this.title, handle: this.handle}).then(response => {
+                window.location = response.data.redirect;
+            }).catch(error => {
+                this.$toast.error(error.response.data.message);
+            });
+        }
+    },
+
+    mounted() {
+        this.$keys.bindGlobal(['return'], e => {
+            if (this.canSubmit) {
+                this.submit();
+            }
+        });
+    }
+}
+</script>
diff --git a/resources/js/components/structures/Wizard.vue b/resources/js/components/structures/Wizard.vue
deleted file mode 100644
index 9a2d9d3bffd..00000000000
--- a/resources/js/components/structures/Wizard.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-    <div class="max-w-xl mx-auto rounded shadow bg-white">
-        <div class="max-w-lg mx-auto pt-6 relative">
-            <div class="wizard-steps">
-                <a class="step" :class="{'complete': currentStep >= index}" v-for="(step, index) in steps" @click="goToStep(index)">
-                    <div class="ball">{{ index+1 }}</div>
-                    <div class="label">{{ step }}</div>
-                </a>
-            </div>
-        </div>
-
-        <!-- Step 1 -->
-        <div v-if="currentStep === 0">
-            <div class="max-w-md mx-auto px-2 py-6 text-center">
-                <h1 class="mb-3" v-text="__('Navigation')" />
-                <p class="text-grey">
-                    {{ __('messages.structure_wizard_description') }}
-                </p>
-            </div>
-            <div class="max-w-md mx-auto px-2 pb-7">
-                <label class="font-bold text-base mb-sm" for="name" v-text="__('Title')" />
-                <input type="text" v-model="structure.title" class="input-text" autofocus tabindex="1">
-                <div class="text-2xs text-grey-60 mt-1 flex items-center">
-                    <svg-icon name="info-circle" class="mr-sm flex items-center mb-px"></svg-icon>
-                    {{ __('messages.structure_wizard_title_instructions') }}
-                </div>
-            </div>
-            <div class="max-w-md mx-auto px-2 pb-7">
-                <label class="font-bold text-base mb-sm" for="name" v-text="__('Handle')" />
-                <input type="text" v-model="structure.handle" class="input-text" tabindex="2">
-                <div class="text-2xs text-grey-60 mt-1 flex items-center">
-                    <svg-icon name="info-circle" class="mr-sm flex items-center mb-px"></svg-icon>
-                    {{ __('messages.structure_wizard_handle_instructions') }}
-                </div>
-            </div>
-        </div>
-
-        <!-- Step 2 -->
-        <div v-if="currentStep === 1">
-            <div class="max-w-md mx-auto px-2 py-6 text-center">
-                <h1 class="mb-3" v-text="__('Purpose')" />
-                <p class="text-grey" v-text="__('messages.structure_wizard_purpose_intro')" />
-            </div>
-            <div class="max-w-lg px-4 mx-auto pb-6 text-center">
-                <div class="-mx-2 flex flex-wrap justify-center">
-                    <div class="w-full md:w-1/3 px-2 mb-2">
-                        <label for="purpose-collection" class="radio-box" :class="{selected: purpose === 'collection'}">
-                            <input id="purpose-collection" class="absolute pin-t pin-r m-1" type="radio" v-model="purpose" value="collection" />
-                            <svg-icon name="calendar" class="w-8 h-8 mx-auto"></svg-icon>
-                            <h3 class="my-2 font-bold" v-text="__('Collection')" />
-                            <p class="text-2xs text-grey" v-text="__('messages.structure_wizard_purpose_collection')" />
-                        </label>
-                    </div>
-                    <div class="w-full md:w-1/3 px-2 mb-2">
-                        <label for="purpose-navigation" class="radio-box" :class="{selected: purpose === 'navigation'}">
-                            <input id="purpose-navigation" class="absolute pin-t pin-r m-1" type="radio" v-model="purpose" value="navigation" />
-                            <svg-icon name="calendar" class="w-8 h-8 mx-auto"></svg-icon>
-                            <h3 class="my-2 font-bold" v-text="__('Navigation')" />
-                            <p class="text-2xs text-grey" v-text="__('messages.structure_wizard_purpose_navigation')" />
-                        </label>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Step 3 -->
-        <div v-if="currentStep === 2">
-            <div class="max-w-md mx-auto px-2 py-6 text-center">
-                <h1 class="mb-3">{{ __('Settings') }}</h1>
-                <p class="text-grey" v-text="__('messages.structure_wizard_settings_intro')" />
-            </div>
-            <div class="max-w-md mx-auto px-2 pb-7" v-if="purpose === 'navigation'">
-                <label class="font-bold text-base mb-sm" for="name" v-text="__('Collections')" />
-                <publish-field-meta
-                    :config="{ handle: 'collections', type: 'collections' }"
-                    :initial-value="structure.collections">
-                    <div slot-scope="{ meta, value, loading }">
-                        <relationship-fieldtype
-                            v-if="!loading"
-                            :config="{ handle: 'collections', type: 'collections' }"
-                            :value="value"
-                            :meta="meta"
-                            handle="collections"
-                            @input="structure.collections = $event" />
-                    </div>
-                </publish-field-meta>
-                <div class="text-2xs text-grey-60 mt-1 flex items-center">
-                    <svg-icon name="info-circle" class="mr-sm flex items-center mb-px"></svg-icon>
-                    {{ __('messages.structure_wizard_collections_instructions') }}
-                </div>
-            </div>
-            <div class="max-w-md mx-auto px-2 pb-7" v-if="purpose === 'collection'">
-                <label class="font-bold text-base mb-sm" for="name" v-text="__('Collection')" />
-                <publish-field-meta
-                    :config="{ handle: 'collection', type: 'collections', max_items: 1 }"
-                    :initial-value="structure.collection ? [structure.collection] : null">
-                    <div slot-scope="{ meta, value, loading }">
-                        <relationship-fieldtype
-                            v-if="!loading"
-                            :config="{ handle: 'collection', type: 'collections', max_items: 1 }"
-                            :value="value"
-                            :meta="meta"
-                            handle="collections"
-                            @input="structure.collection = $event[0]" />
-                    </div>
-                </publish-field-meta>
-                <div class="text-2xs text-grey-60 mt-1 flex items-center">
-                    <svg-icon name="info-circle" class="mr-sm flex items-center mb-px"></svg-icon>
-                    <span v-html="__('messages.structure_wizard_collection_instructions')" />
-                </div>
-            </div>
-            <div class="max-w-md mx-auto px-2 pb-7" v-if="purpose === 'collection'">
-                <label class="font-bold text-base mb-sm" for="name">{{ __('Expect a root page') }}</label>
-                <toggle-fieldtype
-                    handle="expects_root"
-                    v-model="structure.expects_root"  />
-                <div class="text-2xs text-grey-60 mt-1 flex items-center">
-                    <svg-icon name="info-circle" class="mr-sm flex items-center mb-px"></svg-icon>
-                    {{ __('messages.structure_wizard_expect_root_instructions') }}
-                </div>
-            </div>
-            <div class="max-w-md mx-auto px-2 pb-7">
-                <label class="font-bold text-base mb-sm" for="name">{{ __('Max Depth') }}</label>
-                <input type="number" min="1" step="1" v-model="structure.max_depth" class="input-text">
-                <div class="text-2xs text-grey-60 mt-1 flex items-center">
-                    <svg-icon name="info-circle" class="mr-sm flex items-center mb-px"></svg-icon>
-                    {{ __('messages.structure_wizard_max_depth_instructions') }}
-                </div>
-            </div>
-        </div>
-
-        <div class="border-t p-2">
-            <div class="max-w-md mx-auto flex items-center justify-center">
-                <button tabindex="3" class="btn mx-2 w-32" @click="previous" v-if="! onFirstStep">
-                    &larr; {{ __('Previous')}}
-                </button>
-                <button tabindex="4" class="btn mx-2 w-32" :disabled="! canContinue" @click="next" v-if="! onLastStep">
-                    {{ __('Next')}} &rarr;
-                </button>
-                <button tabindex="4" class="btn-primary mx-3" :disabled="! canComplete" @click="submit" v-if="onLastStep">
-                    {{ __('Create Structure')}}
-                </button>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-// Yer a wizard Harry
-
-import HasWizardSteps from '../HasWizardSteps.js';
-
-export default {
-
-    mixins: [HasWizardSteps],
-
-    props: {
-        route: {
-            type: String
-        }
-    },
-
-    data() {
-        return {
-            steps: [__('Naming'), __('Purpose'), __('Settings')],
-            purpose: null,
-            structure: {
-                title: null,
-                handle: null,
-                collections: [],
-                collection: null,
-                max_depth: null,
-                route: '{parent_uri}/{slug}',
-                expects_root: null,
-            }
-        }
-    },
-
-    computed: {
-        canComplete() {
-            return this.canGoToStep(3);
-        }
-    },
-
-    watch: {
-        'structure.title': function(val) {
-            this.structure.handle = this.$slugify(val, '_');
-        },
-
-        purpose(purpose) {
-            if (purpose === 'collection') {
-                this.structure.expects_root = true;
-            }
-        }
-    },
-
-    methods: {
-        canGoToStep(step) {
-            if (step === 1) {
-                return Boolean(this.structure.title && this.structure.handle);
-            }
-
-            if (step === 2) {
-                return Boolean(this.purpose);
-            }
-
-            return true;
-        },
-        submit() {
-            this.$axios.post(this.route, this.structure).then(response => {
-                window.location = response.data.redirect;
-            }).catch(error => {
-                this.$toast.error(error.response.data.message);
-            });
-        }
-    },
-
-    mounted() {
-        this.$keys.bindGlobal(['command+return'], e => {
-            this.next();
-        });
-
-        this.$keys.bindGlobal(['command+delete'], e => {
-            this.previous();
-        });
-    }
-
-}
-</script>
diff --git a/resources/views/structures/create.blade.php b/resources/views/structures/create.blade.php
index 9a7385df4b2..3c493553f91 100644
--- a/resources/views/structures/create.blade.php
+++ b/resources/views/structures/create.blade.php
@@ -1,8 +1,8 @@
 @extends('statamic::layout')
-@section('title', __('Create Structure'))
+@section('title', __('Create Navigation'))
 
 @section('content')
-    <structure-wizard
+    <structure-create-form
         route="{{ cp_route('structures.store') }}">
-    </structure-wizard>
+    </structure-create-form>
 @stop
diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/StructuresController.php
index 2148dd38a67..af984d2cfda 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/StructuresController.php
@@ -189,37 +189,16 @@ public function store(Request $request)
         $values = $request->validate([
             'title' => 'required',
             'handle' => 'required|alpha_dash',
-            'collections' => 'array',
-            'collection' => 'nullable',
-            'max_depth' => 'nullable|integer',
-            'expects_root' => 'nullable',
-            'route' => 'nullable', // todo: change to the structuresites fieldtype
         ]);
 
         $structure = Structure::make()
             ->title($values['title'])
-            ->handle($values['handle'])
-            ->collections($values['collections'] ?? [])
-            ->maxDepth($values['max_depth'])
-            ->expectsRoot($values['expects_root']);
-
-        $sites = [ // todo: change to the structuresites fieldtype
-            ['handle' => Site::default()->handle(), 'route' => $values['route']],
-        ];
+            ->handle($values['handle']);
 
-        foreach ($sites as $site) {
-            $tree = $structure->makeTree($site['handle']);
-            $tree->route($site['route']);
-            $structure->addTree($tree);
-        }
+        $structure->addTree($structure->makeTree(Site::default()->handle()));
 
         $structure->save();
 
-        if ($values['collection']) {
-            Collection::findByHandle($values['collection'])->structure($structure->handle())->save();
-            // todo: add all the collection's entries to the tree.
-        }
-
         return ['redirect' => $structure->showUrl()];
     }
 

From f5d807df3f594094243ecd9ae29fc827f916d6b9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:23:56 -0500
Subject: [PATCH 016/137] Add link dropdown only appears if collections have
 been provided. Otherwise it just opens the link pane immediately.

---
 resources/js/components/structures/View.vue | 24 +++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/structures/View.vue b/resources/js/components/structures/View.vue
index c864fdcdf99..fd9693fe8d1 100644
--- a/resources/js/components/structures/View.vue
+++ b/resources/js/components/structures/View.vue
@@ -14,12 +14,12 @@
 
                 <a @click="$refs.tree.cancel" class="text-2xs text-blue mr-2 underline" v-if="isDirty" v-text="__('Discard changes')" />
 
-                <dropdown-list>
+                <dropdown-list :show-dropdown-if="collections.length > 0">
                     <template #trigger>
-                        <button class="btn" v-text="`${__('Add Link')}`" />
+                        <button class="btn" v-text="__('Add Link')" @click="addLink" />
                     </template>
-                    <dropdown-item :text="__('Link to URL')" @click="$refs.tree.linkPage" />
-                    <dropdown-item :text="__('Link to Entry')" @click="$refs.tree.linkToEntries" />
+                    <dropdown-item :text="__('Link to URL')" @click="linkPage" />
+                    <dropdown-item :text="__('Link to Entry')" @click="linkEntries" />
                 </dropdown-list>
 
                 <button
@@ -95,6 +95,22 @@ export default {
 
     mounted() {
         this.mounted = true;
+    },
+
+    methods: {
+
+        addLink() {
+            if (this.collections.length === 0) this.linkPage();
+        },
+
+        linkPage() {
+            this.$refs.tree.linkPage();
+        },
+
+        linkEntries() {
+            this.$refs.tree.linkToEntries();
+        }
+
     }
 
 }

From 172b9462a5b4282705aa9c9d427d28fabd36fe03 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:37:45 -0500
Subject: [PATCH 017/137] Validate integer as one

---
 src/Fieldtypes/Integer.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Fieldtypes/Integer.php b/src/Fieldtypes/Integer.php
index b1cd9c9540a..d5ec43b26f8 100644
--- a/src/Fieldtypes/Integer.php
+++ b/src/Fieldtypes/Integer.php
@@ -6,6 +6,8 @@
 
 class Integer extends Fieldtype
 {
+    protected $rules = ['integer'];
+
     public function preProcess($data)
     {
         if ($data === null) {

From b332142e72dad8769189b36772c96f39b4780739 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:38:02 -0500
Subject: [PATCH 018/137] Prop was renamed

---
 resources/js/components/fieldtypes/IntegerFieldtype.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/IntegerFieldtype.vue b/resources/js/components/fieldtypes/IntegerFieldtype.vue
index 60a43afd196..3d6a20e23e0 100644
--- a/resources/js/components/fieldtypes/IntegerFieldtype.vue
+++ b/resources/js/components/fieldtypes/IntegerFieldtype.vue
@@ -1,6 +1,6 @@
 <template>
     <text-input
-        type="number"
+        html_type="number"
         tabindex="0"
         :name="name"
         :autofocus="autofocus"

From 9320ca31899b26a9779ce74e4954d49f8a76a51d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:38:24 -0500
Subject: [PATCH 019/137] Include max depth in form

---
 .../Controllers/CP/Structures/StructuresController.php   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/StructuresController.php
index af984d2cfda..f4c17b69fe0 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/StructuresController.php
@@ -140,7 +140,8 @@ public function update(Request $request, $structure)
             ->title($values['title'])
             ->handle($values['handle'])
             ->expectsRoot($expectsRoot = $values['expects_root'])
-            ->collections($values['collections']);
+            ->collections($values['collections'])
+            ->maxDepth($values['max_depth']);
 
         $sites = $values['sites'] ?? [];
 
@@ -261,6 +262,12 @@ public function editFormBlueprint()
                         'display' => 'Expect a root page',
                         'instructions' => 'The first page in the tree should be considered the "root" or "home" page.',
                     ],
+                    'max_depth' => [
+                        'type' => 'integer',
+                        'display' => 'Max depth',
+                        'instructions' => 'The maximum number of levels deep a page may be nested. Leave blank for no limit.',
+                        'validate' => 'min:0',
+                    ],
                 ],
             ],
         ];

From 9436c1751027183bc8d628b15508c443c0814e6d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:38:45 -0500
Subject: [PATCH 020/137] Adjust header

---
 resources/js/components/structures/EditForm.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/structures/EditForm.vue b/resources/js/components/structures/EditForm.vue
index 5e29488e589..055b72ef215 100644
--- a/resources/js/components/structures/EditForm.vue
+++ b/resources/js/components/structures/EditForm.vue
@@ -13,13 +13,11 @@
     >
         <div slot-scope="{ setFieldValue }">
             <header class="mb-3">
-                <breadcrumb :url="listingUrl" :title="__('Navigation')" />
+                <breadcrumb :url="listingUrl" :title="title" />
                 <div class="flex items-center">
-                    <h1 class="flex-1">
-                        {{ title }}
-                    </h1>
-                <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
-            </div>
+                    <h1 class="flex-1" v-text="__('Configure Navigation')" />
+                    <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
+                </div>
             </header>
 
             <configure-sections @updated="setFieldValue" :enable-sidebar="false" />

From 9594bc5b2efc17aa9228b2ede159f7ad1db1e461 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:42:51 -0500
Subject: [PATCH 021/137] Make it a select

---
 src/Http/Controllers/CP/Structures/StructuresController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/StructuresController.php
index f4c17b69fe0..da1b2b1a44f 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/StructuresController.php
@@ -256,6 +256,7 @@ public function editFormBlueprint()
                         'type' => 'collections',
                         'display' => 'Collections',
                         'instructions' => 'You will be able to add links to entries from these collections.',
+                        'mode' => 'select',
                     ],
                     'expects_root' => [
                         'type' => 'toggle',

From 2f087fb9a65e7e17fe1ecc12f529a86603cd77b0 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 15:47:58 -0500
Subject: [PATCH 022/137] Remove icon

---
 resources/js/components/structures/Listing.vue              | 5 +----
 src/Http/Controllers/CP/Structures/StructuresController.php | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/resources/js/components/structures/Listing.vue b/resources/js/components/structures/Listing.vue
index 1534ac5e417..93cfa348fae 100644
--- a/resources/js/components/structures/Listing.vue
+++ b/resources/js/components/structures/Listing.vue
@@ -3,10 +3,7 @@
         <div class="card p-0" slot-scope="{ filteredRows: rows }">
             <data-list-table :rows="rows">
                 <template slot="cell-title" slot-scope="{ row: structure }">
-                    <a :href="structure.show_url" class="flex items-center">
-                        <svg-icon :name="structure.purpose === 'collection' ? 'list-bullets' : 'hierarchy-files'" class="w-4 h-4 text-grey-60 inline-block mr-2" />
-                        {{ structure.title }}
-                    </a>
+                    <a :href="structure.show_url" class="flex items-center" v-text="structure.title" />
                 </template>
                 <template slot="actions" slot-scope="{ row: structure, index }">
                     <dropdown-list>
diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/StructuresController.php
index da1b2b1a44f..e8feb20b1f7 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/StructuresController.php
@@ -27,7 +27,6 @@ public function index()
             return [
                 'id' => $structure->handle(),
                 'title' => $structure->title(),
-                'purpose' => $structure->collection() ? 'collection' : 'navigation',
                 'show_url' => $tree->editUrl(),
                 'edit_url' => $structure->editUrl(),
                 'delete_url' => $structure->deleteUrl(),

From 9e5220b873515303fe9b7e513f816804a83aeaf4 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 21 Feb 2020 17:28:09 -0500
Subject: [PATCH 023/137] Use selects

---
 src/Http/Controllers/CP/Collections/CollectionsController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index c2e9d5b0392..7abd8975fd3 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -309,10 +309,12 @@ protected function editFormBlueprint()
                         'type' => 'blueprints',
                         'instructions' => __('statamic::messages.collections_blueprint_instructions'),
                         'validate' => 'array',
+                        'mode' => 'select',
                     ],
                     'taxonomies' => [
                         'type' => 'taxonomies',
                         'instructions' => __('statamic::messages.collections_taxonomies_instructions'),
+                        'mode' => 'select',
                     ],
                     'default_publish_state' => [
                         'display' => __('Publish by Default'),

From d9c9ff03ce2050330b8bb1ac58ee7bb20eddf672 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 24 Feb 2020 14:17:50 -0500
Subject: [PATCH 024/137] Move structure inline

---
 .../__fixtures__/content/collections/pages.yaml    | 14 +++++++++++++-
 .../__fixtures__/content/structures/pages.yaml     | 13 -------------
 2 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 tests/Stache/__fixtures__/content/structures/pages.yaml

diff --git a/tests/Stache/__fixtures__/content/collections/pages.yaml b/tests/Stache/__fixtures__/content/collections/pages.yaml
index a0b02f7ed17..cb3734386f5 100644
--- a/tests/Stache/__fixtures__/content/collections/pages.yaml
+++ b/tests/Stache/__fixtures__/content/collections/pages.yaml
@@ -1,3 +1,15 @@
 title: Pages
 route: '{parent_uri}/{slug}'
-structure: pages
+structure:
+  root: pages-home
+  tree:
+    -
+      entry: pages-about
+      children:
+        -
+          entry: pages-board
+          children:
+            -
+              entry: pages-directors
+    -
+      entry: pages-blog
diff --git a/tests/Stache/__fixtures__/content/structures/pages.yaml b/tests/Stache/__fixtures__/content/structures/pages.yaml
deleted file mode 100644
index 7d7f8a42090..00000000000
--- a/tests/Stache/__fixtures__/content/structures/pages.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-title: Pages
-root: pages-home
-tree:
-  -
-    entry: pages-about
-    children:
-      -
-        entry: pages-board
-        children:
-          -
-            entry: pages-directors
-  -
-    entry: pages-blog

From 9aaf2dc65547a94fc59e2b5b2957add228d10e64 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 24 Feb 2020 16:04:21 -0500
Subject: [PATCH 025/137] No route necessary in non-collection structures

---
 tests/Stache/__fixtures__/content/structures/footer.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Stache/__fixtures__/content/structures/footer.yaml b/tests/Stache/__fixtures__/content/structures/footer.yaml
index aed6a330991..b637a284e92 100644
--- a/tests/Stache/__fixtures__/content/structures/footer.yaml
+++ b/tests/Stache/__fixtures__/content/structures/footer.yaml
@@ -1,6 +1,5 @@
 title: Footer
 root: pages-home
-route: '{slug}'
 tree:
   -
     entry: pages-about

From 70da200bb7ed66620c221b5627e22a0eba977791 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 24 Feb 2020 16:23:17 -0500
Subject: [PATCH 026/137] Collection structures are stored on the collection
 ...

- A structure-managed collection now has the structure defined in the collection's yaml file
- Structure::find() and findByHandle() expect "collection::{handle}" as the handles when looking for a collection structure
- Structure::all() merges in collection structures.
- Page::setRoute() should allow a null route. The test wasn't catching this because the Structure::collection() logic was causing a collection to always be returned. (first where structurehandle is null always returned a match)
- Store the collection handle alongside structure page uris. The urls only exist for collection-structures. Not nav-structures.
---
 src/Entries/Collection.php                    | 42 ++++++++++--
 src/Stache/Indexes/StructureUris.php          |  5 +-
 .../Repositories/StructureRepository.php      | 18 ++++--
 src/Stache/Stores/CollectionsStore.php        |  2 +-
 src/Structures/Page.php                       |  2 +-
 src/Structures/Structure.php                  | 11 ++--
 tests/Data/Entries/CollectionTest.php         | 64 +++++++++++++++++--
 tests/Data/Structures/TreeTest.php            |  7 +-
 .../ShowStructuredCollectionTest.php          |  6 +-
 tests/Stache/FeatureTest.php                  | 13 +++-
 .../Repositories/StructureRepositoryTest.php  |  8 +--
 11 files changed, 138 insertions(+), 40 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 22620855d2a..64295c0e30d 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -41,6 +41,7 @@ class Collection implements Contract
     protected $futureDateBehavior = 'public';
     protected $pastDateBehavior = 'public';
     protected $structure;
+    protected $structureContents;
     protected $taxonomies = [];
     protected $cascade;
 
@@ -502,26 +503,55 @@ public function structure($structure = null)
         return $this
             ->fluentlyGetOrSet('structure')
             ->getter(function ($structure) {
-                $key = "collection-{$this->id()}-structure-{$structure}";
-                return is_string($structure) ? Blink::once($key, function () use ($structure) {
-                    return Structure::findByHandle($structure);
-                }) : $structure;
+                if (! $structure && $this->structureContents) {
+                    $structure = $this->structure = $this->makeStructureFromContents();
+                }
+                return $structure;
+            })
+            ->setter(function ($structure) {
+                return $structure
+                    ->handle('collection::'.$this->handle)
+                    ->title($this->title());
             })
             ->args(func_get_args());
     }
 
+    public function structureContents(array $contents = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('structureContents')
+            ->args(func_get_args());
+    }
+
+    protected function makeStructureFromContents()
+    {
+        $structure = Structure::make('collection::'.$this->handle)
+            ->collection($this)
+            ->title($this->title());
+
+        $trees = $this->structureContents['trees']
+            ?? [Site::default()->handle() => $this->structureContents['tree']];
+
+        foreach ($trees as $site => $contents) {
+            $tree = $structure->makeTree($site)->tree($contents);
+            $structure->addTree($tree);
+        }
+
+        return $structure;
+    }
+
     public function structureHandle()
     {
         if (! $this->hasStructure()) {
             return null;
         }
 
-        return is_string($this->structure) ? $this->structure : $this->structure->handle();
+        return $this->structure()->handle();
     }
 
     public function hasStructure()
     {
-        return $this->structure !== null;
+        return $this->structure !== null || $this->structureContents !== null;
     }
 
     public function delete()
diff --git a/src/Stache/Indexes/StructureUris.php b/src/Stache/Indexes/StructureUris.php
index fcd9ed289d5..d33ace0abba 100644
--- a/src/Stache/Indexes/StructureUris.php
+++ b/src/Stache/Indexes/StructureUris.php
@@ -26,12 +26,13 @@ protected function structureUris($structure)
     protected function referencedPageUris($tree)
     {
         $site = $tree->locale();
+        $collection = $tree->structure()->collection()->handle();
 
         return $tree->flattenedPages()->filter(function ($page) {
             return $page->reference() && $page->referenceExists();
-        })->mapWithKeys(function ($page) use ($tree, $site) {
+        })->mapWithKeys(function ($page) use ($collection, $site) {
             $key = $site . '::' . $page->uri();
-            $value = $tree->handle() . '::' . $page->reference();
+            $value = $collection . '::' . $page->reference();
             return [$key => $value];
         });
     }
diff --git a/src/Stache/Repositories/StructureRepository.php b/src/Stache/Repositories/StructureRepository.php
index 977e5169377..9f82acfc576 100644
--- a/src/Stache/Repositories/StructureRepository.php
+++ b/src/Stache/Repositories/StructureRepository.php
@@ -2,12 +2,14 @@
 
 namespace Statamic\Stache\Repositories;
 
-use Statamic\Stache\Stache;
 use Illuminate\Support\Collection;
-use Statamic\Facades\Entry as EntryAPI;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Structures\Structure;
 use Statamic\Contracts\Structures\StructureRepository as RepositoryContract;
+use Statamic\Facades;
+use Statamic\Stache\Stache;
+use Statamic\Support\Str;
+use Statamic\Support\Arr;
 
 class StructureRepository implements RepositoryContract
 {
@@ -24,7 +26,9 @@ public function all(): Collection
     {
         $keys = $this->store->paths()->keys();
 
-        return $this->store->getItems($keys);
+        return $this->store->getItems($keys)->merge(
+            Facades\Collection::all()->filter->hasStructure()->map->structure()
+        );
     }
 
     public function find($id): ?Structure
@@ -34,6 +38,10 @@ public function find($id): ?Structure
 
     public function findByHandle($handle): ?Structure
     {
+        if (Str::startsWith($handle, 'collection::')) {
+            return Facades\Collection::find(Str::after($handle, 'collection::'))->structure();
+        }
+
         return $this->store->getItem($handle);
     }
 
@@ -47,9 +55,9 @@ public function findEntryByUri(string $uri, string $site = null): ?Entry
             return null;
         }
 
-        [$handle, $id] = explode('::', $key);
+        [$collection, $id] = explode('::', $key);
 
-        return $this->find($handle)->in($site)->page($id);
+        return $this->find('collection::'.$collection)->in($site)->page($id);
     }
 
     public function save(Structure $structure)
diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index 8fdabdc6fbc..48ecc28d42f 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -50,7 +50,7 @@ public function makeItemFromFile($path, $contents)
             ->searchIndex(array_get($data, 'search_index'))
             ->revisionsEnabled(array_get($data, 'revisions', false))
             ->defaultPublishState($this->getDefaultPublishState($data))
-            ->structure(array_get($data, 'structure'))
+            ->structureContents(array_get($data, 'structure'))
             ->orderable(array_get($data, 'orderable', false))
             ->sortField(array_get($data, 'sort_by'))
             ->sortDirection(array_get($data, 'sort_dir'))
diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index 7e9d900b80b..ffb0923e495 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -123,7 +123,7 @@ public function setParent(?Page $parent): self
         return $this;
     }
 
-    public function setRoute(string $route): self
+    public function setRoute(?string $route): self
     {
         $this->route = $route;
 
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index 88cb1aa05a3..0747d551800 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -23,6 +23,7 @@ class Structure implements StructureContract
     protected $handle;
     protected $sites;
     protected $trees;
+    protected $collection;
     protected $collections;
     protected $maxDepth;
     protected $expectsRoot = false;
@@ -181,13 +182,11 @@ public function collections($collections = null)
             ->args(func_get_args());
     }
 
-    public function collection()
+    public function collection($collection = null)
     {
-        return Blink::once('structure-collection-'.$this->handle, function () {
-            return Collection::all()->first(function ($collection) {
-                return $collection->structureHandle() === $this->handle();
-            });
-        });
+        return $this
+            ->fluentlyGetOrSet('collection')
+            ->args(func_get_args());
     }
 
     public function isCollectionBased()
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index 2b3371c0091..1ea3f498a6e 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -2,14 +2,17 @@
 
 namespace Tests\Data\Entries;
 
+use Facades\Statamic\Fields\BlueprintRepository;
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Contracts\Structures\Structure as StructureContract;
+use Statamic\Entries\Collection;
+use Statamic\Entries\Entry;
 use Statamic\Facades;
-use Tests\TestCase;
 use Statamic\Facades\Site;
+use Statamic\Facades\Structure;
 use Statamic\Fields\Blueprint;
-use Statamic\Entries\Entry;
-use Statamic\Entries\Collection;
 use Tests\PreventSavingStacheItemsToDisk;
-use Facades\Statamic\Fields\BlueprintRepository;
+use Tests\TestCase;
 
 class CollectionTest extends TestCase
 {
@@ -304,4 +307,57 @@ function default_publish_state_is_always_false_when_using_revisions()
         $collection->defaultPublishState(false);
         $this->assertFalse($collection->defaultPublishState());
     }
+
+    /** @test */
+    function it_sets_and_gets_structure()
+    {
+        $structure = Structure::make();
+        $collection = (new Collection)->handle('test');
+        $this->assertFalse($collection->hasStructure());
+        $this->assertNull($collection->structure());
+        $this->assertNull($structure->handle());
+
+        $collection->structure($structure);
+
+        $this->assertTrue($collection->hasStructure());
+        $this->assertSame($structure, $collection->structure());
+        $this->assertEquals('collection::test', $structure->handle());
+        $this->assertEquals('Test', $structure->title());
+    }
+
+    /** @test */
+    function it_sets_the_structure_inline()
+    {
+        // This applies to a file-based approach.
+
+        $collection = (new Collection)->handle('test');
+        $this->assertFalse($collection->hasStructure());
+        $this->assertNull($collection->structure());
+
+        EntryFactory::id('123')->collection('test')->create();
+        EntryFactory::id('456')->collection('test')->create();
+        EntryFactory::id('789')->collection('test')->create();
+
+        $return = $collection->structureContents($contents = [
+            'max_depth' => 2,
+            'expects_root' => true,
+            'tree' => [
+                ['entry' => '123', 'children' => [
+                    ['entry' => '789']
+                ]],
+                ['entry' => '456'],
+            ]
+        ]);
+
+        $this->assertEquals($collection, $return);
+        $this->assertEquals($contents, $collection->structureContents());
+        $this->assertTrue($collection->hasStructure());
+        $structure = $collection->structure();
+        $this->assertInstanceOf(StructureContract::class, $structure);
+        $this->assertEquals('collection::test', $structure->handle());
+        $this->assertTrue($structure->isCollectionBased());
+        $this->assertSame($collection, $structure->collection());
+        $this->assertEquals(2, $structure->in('en')->pages()->all()->count());
+        $this->assertEquals(3, $structure->in('en')->flattenedPages()->count());
+    }
 }
diff --git a/tests/Data/Structures/TreeTest.php b/tests/Data/Structures/TreeTest.php
index c13f893403e..cef5a640096 100644
--- a/tests/Data/Structures/TreeTest.php
+++ b/tests/Data/Structures/TreeTest.php
@@ -31,14 +31,11 @@ public function setUp(): void
     /** @test */
     function it_gets_the_route_from_the_collection()
     {
-        $collection = tap(Collection::make('test-collection')
-            ->structure('test-structure')
-            ->route('the-uri/{slug}')
-        )->save();
+        $collection = tap(Collection::make('test-collection')->route('the-uri/{slug}'))->save();
 
         $this->unlinkAfter($collection->path());
 
-        $structure = (new Structure)->handle('test-structure');
+        $structure = (new Structure)->handle('test-structure')->collection($collection);
         $tree = (new Tree)->structure($structure);
 
         $this->assertEquals('the-uri/{slug}', $tree->route());
diff --git a/tests/Feature/Collections/ShowStructuredCollectionTest.php b/tests/Feature/Collections/ShowStructuredCollectionTest.php
index 0aff16d18a2..d1b89966d54 100644
--- a/tests/Feature/Collections/ShowStructuredCollectionTest.php
+++ b/tests/Feature/Collections/ShowStructuredCollectionTest.php
@@ -14,11 +14,11 @@ class ShowStructuredCollectionTest extends ShowCollectionTest
 
     function createCollection($handle)
     {
-        tap(Structure::make('test'), function ($s) {
+        $structure = Structure::make()->tap(function ($s) {
             $s->addTree($s->makeTree('en'));
-        })->save();
+        });
 
-        return tap(Collection::make('test')->structure('test'))->save();
+        return tap(Collection::make('test')->structure($structure))->save();
     }
 
     /** @test */
diff --git a/tests/Stache/FeatureTest.php b/tests/Stache/FeatureTest.php
index bea1a41bee0..0b59fe90d32 100644
--- a/tests/Stache/FeatureTest.php
+++ b/tests/Stache/FeatureTest.php
@@ -153,15 +153,22 @@ function it_gets_structures()
     /** @test */
     function it_gets_a_structure()
     {
-        $structure = Structure::find('pages');
-        $this->assertEquals('pages', $structure->handle());
+        $structure = Structure::find('footer');
+        $this->assertEquals('footer', $structure->handle());
         // TODO: Some more assertions
     }
 
+    /** @test */
+    function it_gets_a_collection_structure()
+    {
+        $structure = Structure::find('collection::pages');
+        $this->assertEquals('collection::pages', $structure->handle());
+    }
+
     /** @test */
     function it_saves_structures()
     {
-        $structure = Structure::find('pages');
+        $structure = Structure::find('footer');
 
         $repo = Mockery::mock(StructureRepository::class);
         $repo->shouldReceive('save')->with($structure);
diff --git a/tests/Stache/Repositories/StructureRepositoryTest.php b/tests/Stache/Repositories/StructureRepositoryTest.php
index f7502ee51ad..25c448ea709 100644
--- a/tests/Stache/Repositories/StructureRepositoryTest.php
+++ b/tests/Stache/Repositories/StructureRepositoryTest.php
@@ -39,16 +39,16 @@ function it_gets_all_structures()
         $this->assertEveryItemIsInstanceOf(Structure::class, $structures);
 
         $ordered = $structures->sortBy->handle()->values();
-        $this->assertEquals(['footer', 'pages'], $ordered->map->handle()->all());
-        $this->assertEquals(['Footer', 'Pages'], $ordered->map->title()->all());
+        $this->assertEquals(['collection::pages', 'footer'], $ordered->map->handle()->all());
+        $this->assertEquals(['Pages', 'Footer'], $ordered->map->title()->all());
     }
 
     /** @test */
     function it_gets_a_structure_by_handle()
     {
-        tap($this->repo->findByHandle('pages'), function ($structure) {
+        tap($this->repo->findByHandle('collection::pages'), function ($structure) {
             $this->assertInstanceOf(Structure::class, $structure);
-            $this->assertEquals('pages', $structure->handle());
+            $this->assertEquals('collection::pages', $structure->handle());
             $this->assertEquals('Pages', $structure->title());
         });
 

From 7995cdc2d8a7810ae1a566c91cb3a7ea37910d1a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 25 Feb 2020 16:22:32 -0500
Subject: [PATCH 027/137] Move the Facades\Nav class, used to modify the CP's
 side navigation, into Facades\CP\Nav in preparation for more upcoming nav
 changes

---
 resources/views/partials/nav-main.blade.php | 2 +-
 src/CP/Navigation/CoreNav.php               | 2 +-
 src/CP/Navigation/NavItem.php               | 2 +-
 src/Facades/{ => CP}/Nav.php                | 2 +-
 tests/Facades/{ => CP}/NavTest.php          | 4 ++--
 tests/TestCase.php                          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/Facades/{ => CP}/Nav.php (87%)
 rename tests/Facades/{ => CP}/NavTest.php (99%)

diff --git a/resources/views/partials/nav-main.blade.php b/resources/views/partials/nav-main.blade.php
index 2c736de2ce7..46cf0364e28 100644
--- a/resources/views/partials/nav-main.blade.php
+++ b/resources/views/partials/nav-main.blade.php
@@ -1,7 +1,7 @@
 @section('nav-main')
     <nav class="nav-main" v-cloak>
         <div class="nav-main-inner">
-            @foreach (Statamic\Facades\Nav::build() as $section => $items)
+            @foreach (Statamic\Facades\CP\Nav::build() as $section => $items)
                 @if ($section !== 'Top Level')
                     <h6>{{ __($section) }}</h6>
                 @endif
diff --git a/src/CP/Navigation/CoreNav.php b/src/CP/Navigation/CoreNav.php
index 5ede2d9cfaa..6789b11c583 100644
--- a/src/CP/Navigation/CoreNav.php
+++ b/src/CP/Navigation/CoreNav.php
@@ -2,7 +2,7 @@
 
 namespace Statamic\CP\Navigation;
 
-use Statamic\Facades\Nav;
+use Statamic\Facades\CP\Nav;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Facades\Form as FormAPI;
diff --git a/src/CP/Navigation/NavItem.php b/src/CP/Navigation/NavItem.php
index 1eb71ecec7c..fe655a73cdd 100644
--- a/src/CP/Navigation/NavItem.php
+++ b/src/CP/Navigation/NavItem.php
@@ -3,7 +3,7 @@
 namespace Statamic\CP\Navigation;
 
 use Exception;
-use Statamic\Facades\Nav;
+use Statamic\Facades\CP\Nav;
 use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
diff --git a/src/Facades/Nav.php b/src/Facades/CP/Nav.php
similarity index 87%
rename from src/Facades/Nav.php
rename to src/Facades/CP/Nav.php
index ed6f9199492..b8607186da5 100644
--- a/src/Facades/Nav.php
+++ b/src/Facades/CP/Nav.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Statamic\Facades;
+namespace Statamic\Facades\CP;
 
 use Illuminate\Support\Facades\Facade;
 use Statamic\CP\Navigation\Nav as Navigation;
diff --git a/tests/Facades/NavTest.php b/tests/Facades/CP/NavTest.php
similarity index 99%
rename from tests/Facades/NavTest.php
rename to tests/Facades/CP/NavTest.php
index d90b91d3bd8..99366d8b8cb 100644
--- a/tests/Facades/NavTest.php
+++ b/tests/Facades/CP/NavTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\Facades;
+namespace Tests\Facades\CP;
 
 use Tests\TestCase;
-use Statamic\Facades\Nav;
+use Statamic\Facades\CP\Nav;
 use Tests\FakesRoles;
 use Statamic\Facades\User;
 use Illuminate\Support\Facades\Route;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 8b1ab9f7321..477a582fe52 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -29,7 +29,7 @@ protected function setUp(): void
         }
 
         if ($this->shouldPreventNavBeingBuilt) {
-            \Statamic\Facades\Nav::shouldReceive('build')->andReturn([]);
+            \Statamic\Facades\CP\Nav::shouldReceive('build')->andReturn([]);
             $this->addToAssertionCount(-1); // Dont want to assert this
         }
     }

From df64acf02735e610b994fd6a27ff01177012d588 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 25 Feb 2020 16:29:31 -0500
Subject: [PATCH 028/137] Root is now part of the tree ...

- The root lives in the tree array. This is so that if you change whether its expecting a root, you don't have to also move the root.
- The root/parent is pulled out of the array if its expecting a root
- The primary reason it was a separate variable before was so you couldn't give it child pages. Just add an exception now.
---
 src/Structures/Tree.php            | 59 +++++++-----------
 tests/Data/Structures/TreeTest.php | 96 +++++++++++++++++++++++++++++-
 2 files changed, 114 insertions(+), 41 deletions(-)

diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 930111a4255..ffb8bfd92b8 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -2,10 +2,10 @@
 
 namespace Statamic\Structures;
 
+use Statamic\Contracts\Data\Localization;
+use Statamic\Data\ExistsAsFile;
 use Statamic\Facades;
 use Statamic\Facades\Stache;
-use Statamic\Data\ExistsAsFile;
-use Statamic\Contracts\Data\Localization;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
 class Tree implements Localization
@@ -13,7 +13,6 @@ class Tree implements Localization
     use ExistsAsFile, FluentlyGetsAndSets;
 
     protected $locale;
-    protected $root;
     protected $tree = [];
     protected $structure;
     protected $cachedFlattenedPages;
@@ -37,13 +36,13 @@ public function tree($tree = null)
             ->args(func_get_args());
     }
 
-    public function root($root = null)
+    public function root()
     {
-        return $this->fluentlyGetOrSet('root')
-            ->setter(function ($root) {
-                return $this->validateRoot($root);
-            })
-            ->args(func_get_args());
+        if (! $this->structure()->expectsRoot()) {
+            return null;
+        }
+
+        return $this->tree[0]['entry'];
     }
 
     public function sites()
@@ -78,13 +77,13 @@ public function path()
 
     public function parent()
     {
-        if (!$this->root) {
+        if (!$this->root()) {
             return null;
         }
 
         return (new Page)
             ->setTree($this)
-            ->setEntry($this->root)
+            ->setEntry($this->root())
             ->setRoute($this->route())
             ->setDepth(1)
             ->setRoot(true);
@@ -92,9 +91,15 @@ public function parent()
 
     public function pages()
     {
+        $pages = $this->tree;
+
+        if ($this->root()) {
+            $pages = array_slice($pages, 1);
+        }
+
         $pages = (new Pages)
             ->setTree($this)
-            ->setPages($this->tree)
+            ->setPages($pages)
             ->setParent($this->parent())
             ->setDepth(1);
 
@@ -138,7 +143,6 @@ public function save()
     public function fileData()
     {
         return [
-            'root' => $this->root,
             'tree' => $this->removeEmptyChildren($this->tree),
         ];
     }
@@ -161,15 +165,6 @@ public function editUrl()
         return cp_route('structures.show', ['structure' => $this->handle(), 'site' => $this->locale()]);
     }
 
-    public function toCacheableArray()
-    {
-        return [
-            'path' => $this->initialPath() ?? $this->path(),
-            'root' => $this->root,
-            'tree' => $this->tree,
-        ];
-    }
-
     public function append($entry)
     {
         $this->tree[] = ['entry' => $entry->id()];
@@ -255,31 +250,19 @@ private function removeFromInBranches($entry, $branches)
         return [$match, array_values($branches)];
     }
 
-    protected function validateRoot($root)
+    protected function validateTree($tree)
     {
-        if (! $this->structure->isCollectionBased()) {
-            return $root;
-        }
-
-        if ($entryId = $this->getEntryIdsFromTree($this->tree)->duplicates()->first()) {
-            $this->throwDuplicateEntryException($entryId);
+        if ($this->structure->expectsRoot()) {
+            throw_unless(isset($tree[0]['entry']), new \Exception('Root page must be an entry'));
+            throw_if(isset($tree[0]['children']), new \Exception('Root page cannot have children'));
         }
 
-        return $root;
-    }
-
-    protected function validateTree($tree)
-    {
         if (! $this->structure->isCollectionBased()) {
             return $tree;
         }
 
         $entryIds = $this->getEntryIdsFromTree($tree);
 
-        if ($this->root) {
-            $entryIds->push($this->root);
-        }
-
         if ($entryId = $entryIds->duplicates()->first()) {
             $this->throwDuplicateEntryException($entryId);
         }
diff --git a/tests/Data/Structures/TreeTest.php b/tests/Data/Structures/TreeTest.php
index cef5a640096..15fcbb2a8b5 100644
--- a/tests/Data/Structures/TreeTest.php
+++ b/tests/Data/Structures/TreeTest.php
@@ -86,6 +86,9 @@ function it_appends_an_entry()
         $tree->append(Entry::make()->id('appended-page'));
 
         $this->assertEquals([
+            [
+                'entry' => 'pages-home',
+            ],
             [
                 'entry' => 'pages-about',
                 'children' => [
@@ -116,6 +119,9 @@ function it_appends_an_entry_to_another_page()
         $tree->appendTo('pages-board', Entry::make()->id('appended-page'));
 
         $this->assertEquals([
+            [
+                'entry' => 'pages-home',
+            ],
             [
                 'entry' => 'pages-about',
                 'children' => [
@@ -145,12 +151,15 @@ function it_moves_an_entry_to_another_page()
 
         // Add [foo=>bar] to the directors page, just so we can test the whole array gets moved.
         $treeContent = $tree->tree();
-        $treeContent[0]['children'][0]['children'][0]['foo'] = 'bar';
+        $treeContent[1]['children'][0]['children'][0]['foo'] = 'bar';
         $tree->tree($treeContent);
 
         $tree->move('pages-directors', 'pages-about');
 
         $this->assertEquals([
+            [
+                'entry' => 'pages-home',
+            ],
             [
                 'entry' => 'pages-about',
                 'children' => [
@@ -173,6 +182,9 @@ function it_moves_an_entry_to_another_page()
     function it_doesnt_get_moved_if_its_already_in_the_target()
     {
         $tree = $this->tree()->tree($arr = [
+            [
+                'entry' => 'pages-home',
+            ],
             [
                 'entry' => 'pages-about',
                 'children' => [
@@ -198,6 +210,9 @@ function it_doesnt_get_moved_if_its_already_in_the_target()
     function it_fixes_indexes_when_moving()
     {
         $tree = $this->tree()->tree([
+            [
+                'entry' => 'pages-home',
+            ],
             [
                 'entry' => 'pages-blog',
             ],
@@ -215,6 +230,9 @@ function it_fixes_indexes_when_moving()
 
         // If the indexes hadn't been fixed, we'd have an array starting with 1.
         $this->assertEquals([
+            [
+                'entry' => 'pages-home',
+            ],
             [
                 'entry' => 'pages-about',
                 'children' => [
@@ -229,12 +247,84 @@ function it_fixes_indexes_when_moving()
         ], $tree->tree());
     }
 
+    /** @test */
+    function the_root_must_be_an_entry_when_expecting_root()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Root page must be an entry');
+
+        (new Tree)
+            ->structure((new Structure)->expectsRoot(true))
+            ->tree([
+                [
+                    'title' => 'Not an entry',
+                    'url' => '/test',
+                ]
+            ]);
+    }
+
+    /** @test **/
+    function the_root_doesnt_need_to_be_an_entry_when_not_expecting_root()
+    {
+        $tree = (new Tree)
+            ->structure((new Structure)->expectsRoot(false))
+            ->tree($contents = [
+                [
+                    'title' => 'Not an entry',
+                    'url' => '/test',
+                ]
+            ]);
+
+        $this->assertSame($contents, $tree->tree());
+    }
+
+    /** @test */
+    function the_root_cannot_have_children_when_expecting_root()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Root page cannot have children');
+
+        (new Tree)
+            ->structure((new Structure)->expectsRoot(true))
+            ->tree([
+                [
+                    'entry' => '123',
+                    'children' => [
+                        [
+                            'entry' => '456'
+                        ]
+                    ]
+                ]
+            ]);
+    }
+
+    /** @test */
+    function the_root_can_have_children_when_not_expecting_root()
+    {
+        $tree = (new Tree)
+            ->structure((new Structure)->expectsRoot(false))
+            ->tree($contents = [
+                [
+                    'entry' => '123',
+                    'children' => [
+                        [
+                            'entry' => '456'
+                        ]
+                    ]
+                ]
+            ]);
+
+        $this->assertSame($contents, $tree->tree());
+    }
+
     protected function tree()
     {
         return (new Tree)
-            ->structure(new Structure)
-            ->root('pages-home')
+            ->structure((new Structure)->expectsRoot(true))
             ->tree([
+                [
+                    'entry' => 'pages-home',
+                ],
                 [
                     'entry' => 'pages-about',
                     'children' => [

From 38cdbf2b7c71b36863182e678f81de214abce9ef Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 26 Feb 2020 10:58:34 -0500
Subject: [PATCH 029/137] Nav and structure tweaks ...

- Navs are now the things stored in the stache and in yaml files
- You can query Navs specifically, instead of getting all structures and filtering them manually.
- Structure facade and repo is still a thing, but it just combines navs and collection structures.
- Structured entry URIs are just stored on the entry instead of its own index. They get updated when the collection is updated.
- expects_root is now just a root boolean
---
 config/stache.php                             |  6 +-
 .../Entries/CollectionRepository.php          |  1 +
 .../Structures/NavigationRepository.php       | 15 ++++
 .../Structures/StructureRepository.php        |  1 -
 src/Entries/Collection.php                    |  7 +-
 src/Facades/Nav.php                           | 14 +++
 src/Providers/AppServiceProvider.php          |  3 +-
 src/Stache/Indexes/StructureUris.php          | 58 -------------
 .../Repositories/CollectionRepository.php     | 16 ++--
 src/Stache/Repositories/EntryRepository.php   | 17 ++--
 ...epository.php => NavigationRepository.php} | 29 +------
 src/Stache/Stores/CollectionsStore.php        |  4 +-
 ...tructuresStore.php => NavigationStore.php} | 12 +--
 src/Structures/Structure.php                  | 13 +--
 src/Structures/StructureRepository.php        | 49 +++++++++++
 tests/Data/Entries/CollectionTest.php         |  1 -
 .../Structures/StructureRepositoryTest.php    | 75 ++++++++++++++++
 tests/Stache/FeatureTest.php                  | 27 +++++-
 .../Repositories/CollectionRepositoryTest.php |  4 +-
 .../Repositories/EntryRepositoryTest.php      |  4 +-
 .../Repositories/NavigationRepositoryTest.php | 78 +++++++++++++++++
 .../Repositories/StructureRepositoryTest.php  | 87 -------------------
 ...sStoreTest.php => NavigationStoreTest.php} | 17 ++--
 .../content/collections/pages.yaml            |  4 +-
 .../{structures => navigation}/footer.yaml    |  0
 .../content/navigation/sidebar.yaml           |  6 ++
 tests/TestCase.php                            |  2 +-
 27 files changed, 325 insertions(+), 225 deletions(-)
 create mode 100644 src/Contracts/Structures/NavigationRepository.php
 create mode 100644 src/Facades/Nav.php
 delete mode 100644 src/Stache/Indexes/StructureUris.php
 rename src/Stache/Repositories/{StructureRepository.php => NavigationRepository.php} (56%)
 rename src/Stache/Stores/{StructuresStore.php => NavigationStore.php} (93%)
 create mode 100644 src/Structures/StructureRepository.php
 create mode 100644 tests/Data/Structures/StructureRepositoryTest.php
 create mode 100644 tests/Stache/Repositories/NavigationRepositoryTest.php
 delete mode 100644 tests/Stache/Repositories/StructureRepositoryTest.php
 rename tests/Stache/Stores/{StructuresStoreTest.php => NavigationStoreTest.php} (90%)
 rename tests/Stache/__fixtures__/content/{structures => navigation}/footer.yaml (100%)
 create mode 100644 tests/Stache/__fixtures__/content/navigation/sidebar.yaml

diff --git a/config/stache.php b/config/stache.php
index 338fa56ee60..e8f11cc4f9c 100644
--- a/config/stache.php
+++ b/config/stache.php
@@ -48,9 +48,9 @@
             'directory' => base_path('content/collections'),
         ],
 
-        'structures' => [
-            'class' => Stores\StructuresStore::class,
-            'directory' => base_path('content/structures'),
+        'navigation' => [
+            'class' => Stores\NavigationStore::class,
+            'directory' => base_path('content/navigation'),
         ],
 
         'globals' => [
diff --git a/src/Contracts/Entries/CollectionRepository.php b/src/Contracts/Entries/CollectionRepository.php
index 3cd1ffb5691..2f2d0b56315 100644
--- a/src/Contracts/Entries/CollectionRepository.php
+++ b/src/Contracts/Entries/CollectionRepository.php
@@ -14,4 +14,5 @@ public function findByMount($mount): ?Collection;
     public function make(string $handle = null): Collection;
     public function handles(): IlluminateCollection;
     public function handleExists(string $handle): bool;
+    public function whereStructured(): IlluminateCollection;
 }
diff --git a/src/Contracts/Structures/NavigationRepository.php b/src/Contracts/Structures/NavigationRepository.php
new file mode 100644
index 00000000000..703ab9a7ad5
--- /dev/null
+++ b/src/Contracts/Structures/NavigationRepository.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Contracts\Structures;
+
+use Illuminate\Support\Collection;
+use Statamic\Contracts\Structures\Structure;
+
+interface NavigationRepository
+{
+    public function all(): Collection;
+    public function find($id): ?Structure;
+    public function findByHandle($handle): ?Structure;
+    public function save(Structure $structure);
+    public function make(string $handle = null): Structure;
+}
diff --git a/src/Contracts/Structures/StructureRepository.php b/src/Contracts/Structures/StructureRepository.php
index 48dd214ee17..c8d889c1bfc 100644
--- a/src/Contracts/Structures/StructureRepository.php
+++ b/src/Contracts/Structures/StructureRepository.php
@@ -11,7 +11,6 @@ interface StructureRepository
     public function all(): Collection;
     public function find($id): ?Structure;
     public function findByHandle($handle): ?Structure;
-    public function findEntryByUri(string $uri, string $site = null): ?Entry;
     public function save(Structure $structure);
     public function make(string $handle = null): Structure;
 }
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 64295c0e30d..81f9f349716 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -270,7 +270,9 @@ public function save()
         Blink::flush('collection-handles');
         Blink::flushStartingWith("collection-{$this->id()}");
 
-        optional($this->structure())->updateEntryUris();
+        if ($this->hasStructure()) { // todo: only if the structure changed.
+            $this->updateEntryUris();
+        }
 
         return $this;
     }
@@ -527,7 +529,8 @@ protected function makeStructureFromContents()
     {
         $structure = Structure::make('collection::'.$this->handle)
             ->collection($this)
-            ->title($this->title());
+            ->title($this->title())
+            ->expectsRoot($this->structureContents['root'] ?? false);
 
         $trees = $this->structureContents['trees']
             ?? [Site::default()->handle() => $this->structureContents['tree']];
diff --git a/src/Facades/Nav.php b/src/Facades/Nav.php
new file mode 100644
index 00000000000..4940850feb8
--- /dev/null
+++ b/src/Facades/Nav.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Structures\NavigationRepository;
+
+class Nav extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return NavigationRepository::class;
+    }
+}
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index a52172b4505..f32a881d601 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -94,7 +94,8 @@ public function register()
             \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
             \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
             \Statamic\Contracts\Data\Repositories\ContentRepository::class => \Statamic\Stache\Repositories\ContentRepository::class,
-            \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Stache\Repositories\StructureRepository::class,
+            \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
+            \Statamic\Contracts\Structures\NavigationRepository::class => \Statamic\Stache\Repositories\NavigationRepository::class,
             \Statamic\Contracts\Assets\AssetRepository::class => \Statamic\Assets\AssetRepository::class,
         ])->each(function ($concrete, $abstract) {
             $this->app->singleton($abstract, $concrete);
diff --git a/src/Stache/Indexes/StructureUris.php b/src/Stache/Indexes/StructureUris.php
deleted file mode 100644
index d33ace0abba..00000000000
--- a/src/Stache/Indexes/StructureUris.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Statamic\Stache\Indexes;
-
-use Statamic\Support\Str;
-use Statamic\Facades\Structure;
-
-class StructureUris extends Index
-{
-    public function getItems()
-    {
-        return Structure::all()->filter(function ($structure) {
-            return $structure->collection();
-        })->flatMap(function ($structure) {
-            return $this->structureUris($structure);
-        })->all();
-    }
-
-    protected function structureUris($structure)
-    {
-        return $structure->trees()->flatMap(function ($tree) {
-            return $this->referencedPageUris($tree);
-        });
-    }
-
-    protected function referencedPageUris($tree)
-    {
-        $site = $tree->locale();
-        $collection = $tree->structure()->collection()->handle();
-
-        return $tree->flattenedPages()->filter(function ($page) {
-            return $page->reference() && $page->referenceExists();
-        })->mapWithKeys(function ($page) use ($collection, $site) {
-            $key = $site . '::' . $page->uri();
-            $value = $collection . '::' . $page->reference();
-            return [$key => $value];
-        });
-    }
-
-    public function updateItem($item)
-    {
-        if (! $item->isCollectionBased()) {
-            return;
-        }
-
-        $this->load();
-
-        // Remove this structure's values, then add back fresh versions.
-        $this->items = collect($this->items)
-            ->reject(function ($key) use ($item) {
-                return Str::startsWith($key, $item->handle() . '::');
-            })
-            ->merge($this->structureUris($item))
-            ->all();
-
-        $this->cache();
-    }
-}
diff --git a/src/Stache/Repositories/CollectionRepository.php b/src/Stache/Repositories/CollectionRepository.php
index cc8f3019c19..448fa2c9ed7 100644
--- a/src/Stache/Repositories/CollectionRepository.php
+++ b/src/Stache/Repositories/CollectionRepository.php
@@ -2,13 +2,14 @@
 
 namespace Statamic\Stache\Repositories;
 
-use Statamic\Stache\Stache;
-use Statamic\Facades\Blink;
-use Statamic\Entries\Collection;
-use Statamic\Events\Data\CollectionSaved;
-use Statamic\Events\Data\CollectionDeleted;
 use Illuminate\Support\Collection as IlluminateCollection;
 use Statamic\Contracts\Entries\CollectionRepository as RepositoryContract;
+use Statamic\Contracts\Structures\Structure;
+use Statamic\Entries\Collection;
+use Statamic\Events\Data\CollectionDeleted;
+use Statamic\Events\Data\CollectionSaved;
+use Statamic\Facades\Blink;
+use Statamic\Stache\Stache;
 
 class CollectionRepository implements RepositoryContract
 {
@@ -88,4 +89,9 @@ public function updateEntryUris(Collection $collection)
     {
         $this->store->updateEntryUris($collection);
     }
+
+    public function whereStructured(): IlluminateCollection
+    {
+        return $this->all()->filter->hasStructure();
+    }
 }
diff --git a/src/Stache/Repositories/EntryRepository.php b/src/Stache/Repositories/EntryRepository.php
index b13d22ee628..4bfcd2912c1 100644
--- a/src/Stache/Repositories/EntryRepository.php
+++ b/src/Stache/Repositories/EntryRepository.php
@@ -2,12 +2,12 @@
 
 namespace Statamic\Stache\Repositories;
 
-use Statamic\Stache\Stache;
 use Statamic\Contracts\Entries\Entry;
+use Statamic\Contracts\Entries\EntryRepository as RepositoryContract;
 use Statamic\Entries\EntryCollection;
+use Statamic\Facades\Collection;
 use Statamic\Stache\Query\EntryQueryBuilder;
-use Statamic\Contracts\Structures\StructureRepository;
-use Statamic\Contracts\Entries\EntryRepository as RepositoryContract;
+use Statamic\Stache\Stache;
 
 class EntryRepository implements RepositoryContract
 {
@@ -52,11 +52,18 @@ public function findByUri(string $uri, string $site = null): ?Entry
     {
         $site = $site ?? $this->stache->sites()->first();
 
-        return app(StructureRepository::class)->findEntryByUri($uri, $site)
-            ?? $this->query()
+        $entry = $this->query()
                 ->where('uri', $uri)
                 ->where('site', $site)
                 ->first();
+
+        if (! $entry) {
+            return null;
+        }
+
+        return $entry->hasStructure()
+            ? $entry->structure()->in($site)->page($entry->id())
+            : $entry;
     }
 
     public function save($entry)
diff --git a/src/Stache/Repositories/StructureRepository.php b/src/Stache/Repositories/NavigationRepository.php
similarity index 56%
rename from src/Stache/Repositories/StructureRepository.php
rename to src/Stache/Repositories/NavigationRepository.php
index 9f82acfc576..aa568f35929 100644
--- a/src/Stache/Repositories/StructureRepository.php
+++ b/src/Stache/Repositories/NavigationRepository.php
@@ -5,13 +5,13 @@
 use Illuminate\Support\Collection;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Structures\Structure;
-use Statamic\Contracts\Structures\StructureRepository as RepositoryContract;
+use Statamic\Contracts\Structures\NavigationRepository as RepositoryContract;
 use Statamic\Facades;
 use Statamic\Stache\Stache;
 use Statamic\Support\Str;
 use Statamic\Support\Arr;
 
-class StructureRepository implements RepositoryContract
+class NavigationRepository implements RepositoryContract
 {
     protected $stache;
     protected $store;
@@ -19,16 +19,14 @@ class StructureRepository implements RepositoryContract
     public function __construct(Stache $stache)
     {
         $this->stache = $stache;
-        $this->store = $stache->store('structures');
+        $this->store = $stache->store('navigation');
     }
 
     public function all(): Collection
     {
         $keys = $this->store->paths()->keys();
 
-        return $this->store->getItems($keys)->merge(
-            Facades\Collection::all()->filter->hasStructure()->map->structure()
-        );
+        return $this->store->getItems($keys);
     }
 
     public function find($id): ?Structure
@@ -38,28 +36,9 @@ public function find($id): ?Structure
 
     public function findByHandle($handle): ?Structure
     {
-        if (Str::startsWith($handle, 'collection::')) {
-            return Facades\Collection::find(Str::after($handle, 'collection::'))->structure();
-        }
-
         return $this->store->getItem($handle);
     }
 
-    public function findEntryByUri(string $uri, string $site = null): ?Entry
-    {
-        $uri = str_start($uri, '/');
-
-        $site = $site ?? $this->stache->sites()->first();
-
-        if (! $key = $this->store->index('uri')->get($site.'::'.$uri)) {
-            return null;
-        }
-
-        [$collection, $id] = explode('::', $key);
-
-        return $this->find('collection::'.$collection)->in($site)->page($id);
-    }
-
     public function save(Structure $structure)
     {
         $this->store->save($structure);
diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index 48ecc28d42f..db42e009bf1 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -116,8 +116,8 @@ public function handleFileChanges()
 
         parent::handleFileChanges();
 
-        // TODO: only update structures for collections that were modified.
-        Structure::all()->each->updateEntryUris();
+        // TODO: only update urls for structured collection that were modified.
+        Collection::all()->each->updateEntryUris();
 
         // TODO: only update order indexes for collections that were modified.
         Collection::all()->filter->orderable()->each(function ($collection) {
diff --git a/src/Stache/Stores/StructuresStore.php b/src/Stache/Stores/NavigationStore.php
similarity index 93%
rename from src/Stache/Stores/StructuresStore.php
rename to src/Stache/Stores/NavigationStore.php
index 15a5ab57928..958ce5ba342 100644
--- a/src/Stache/Stores/StructuresStore.php
+++ b/src/Stache/Stores/NavigationStore.php
@@ -7,19 +7,14 @@
 use Statamic\Facades\Path;
 use Statamic\Facades\Site;
 use Statamic\Facades\YAML;
-use Statamic\Stache\Indexes;
 use Statamic\Support\Str;
 use Symfony\Component\Finder\SplFileInfo;
 
-class StructuresStore extends BasicStore
+class NavigationStore extends BasicStore
 {
-    protected $storeIndexes = [
-        'uri' => Indexes\StructureUris::class,
-    ];
-
     public function key()
     {
-        return 'structures';
+        return 'navigation';
     }
 
     public function getItemFilter(SplFileInfo $file)
@@ -63,7 +58,6 @@ protected function makeSingleSiteStructureFromFile($handle, $path, $data)
         return $structure->addTree(
             $structure
                 ->makeTree($site)
-                ->root($data['root'] ?? null)
                 ->tree($data['tree'] ?? [])
         );
     }
@@ -89,7 +83,7 @@ protected function makeBaseStructureFromFile($handle, $path, $data)
             ->sites($data['sites'] ?? null)
             ->maxDepth($data['max_depth'] ?? null)
             ->collections($data['collections'] ?? null)
-            ->expectsRoot($data['expects_root'] ?? false)
+            ->expectsRoot($data['root'] ?? false)
             ->initialPath($path);
     }
 
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index 0747d551800..b1230e34202 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -89,7 +89,7 @@ public function toCacheableArray()
             'title' => $this->title,
             'handle' => $this->handle,
             'sites' => $this->sites,
-            'expects_root' => $this->expectsRoot,
+            'root' => $this->expectsRoot,
             'path' => $this->initialPath() ?? $this->path(),
             'max_depth' => $this->maxDepth,
             'collections' => $this->collections,
@@ -100,7 +100,7 @@ public function toCacheableArray()
     public function path()
     {
         return vsprintf('%s/%s.yaml', [
-            rtrim(Stache::store('structures')->directory(), '/'),
+            rtrim(Stache::store('navigation')->directory(), '/'),
             $this->handle
         ]);
     }
@@ -111,7 +111,7 @@ public function fileData()
             'title' => $this->title,
             'collections' => $this->collections,
             'max_depth' => $this->maxDepth,
-            'expects_root' => $this->expectsRoot ?: null,
+            'root' => $this->expectsRoot ?: null,
         ];
 
         if (Site::hasMultiple()) {
@@ -220,13 +220,6 @@ public function entryUri($entry)
         return optional($page)->uri();
     }
 
-    public function updateEntryUris()
-    {
-        StructureAPI::updateEntryUris($this);
-
-        return $this;
-    }
-
     public static function __callStatic($method, $parameters)
     {
         return Facades\Structure::{$method}(...$parameters);
diff --git a/src/Structures/StructureRepository.php b/src/Structures/StructureRepository.php
new file mode 100644
index 00000000000..7302f9a9b57
--- /dev/null
+++ b/src/Structures/StructureRepository.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Statamic\Structures;
+
+use Illuminate\Support\Collection as IlluminateCollection;
+use Statamic\Contracts\Entries\Entry;
+use Statamic\Contracts\Structures\Structure;
+use Statamic\Contracts\Structures\StructureRepository as RepositoryContract;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Nav;
+use Statamic\Support\Str;
+
+class StructureRepository implements RepositoryContract
+{
+    public function all(): IlluminateCollection
+    {
+        return Nav::all()
+            ->merge(Collection::whereStructured()->map->structure());
+    }
+
+    public function find($id): ?Structure
+    {
+        return $this->findByHandle($id);
+    }
+
+    public function findByHandle($handle): ?Structure
+    {
+        if (Str::startsWith($handle, 'collection::')) {
+            return Collection::find(Str::after($handle, 'collection::'))->structure();
+        }
+
+        return Nav::find($handle);
+    }
+
+    public function save(Structure $structure)
+    {
+        $this->store->save($structure);
+    }
+
+    public function delete(Structure $structure)
+    {
+        $this->store->delete($structure);
+    }
+
+    public function make(string $handle = null): Structure
+    {
+        return (new \Statamic\Structures\Structure)->handle($handle);
+    }
+}
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index 1ea3f498a6e..df63badd810 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -340,7 +340,6 @@ function it_sets_the_structure_inline()
 
         $return = $collection->structureContents($contents = [
             'max_depth' => 2,
-            'expects_root' => true,
             'tree' => [
                 ['entry' => '123', 'children' => [
                     ['entry' => '789']
diff --git a/tests/Data/Structures/StructureRepositoryTest.php b/tests/Data/Structures/StructureRepositoryTest.php
new file mode 100644
index 00000000000..7b1c92b3286
--- /dev/null
+++ b/tests/Data/Structures/StructureRepositoryTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Data\Structures;
+
+use Statamic\Contracts\Structures\Structure as StructureContract;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Nav;
+use Statamic\Structures\Structure;
+use Statamic\Structures\StructureRepository;
+use Tests\TestCase;
+
+class StuctureRepositoryTest extends TestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->repo = new StructureRepository;
+    }
+
+    /** @test */
+    function it_gets_all_structures()
+    {
+        Nav::shouldReceive('all')->andReturn(collect([
+            (new Structure)->handle('nav-a'),
+            (new Structure)->handle('nav-b'),
+            (new Structure)->handle('nav-c'),
+        ]));
+
+        $collections = collect([
+            Collection::make('collection-structure-a')->structure(new Structure),
+            Collection::make('collection-structure-b')->structure(new Structure),
+        ]);
+        Collection::shouldReceive('whereStructured')->andReturn($collections);
+
+        $structures = $this->repo->all();
+
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $structures);
+        $this->assertCount(5, $structures);
+        $this->assertEveryItemIsInstanceOf(StructureContract::class, $structures);
+        $this->assertEquals([
+            'nav-a',
+            'nav-b',
+            'nav-c',
+            'collection::collection-structure-a',
+            'collection::collection-structure-b',
+        ], $structures->map->handle()->all());
+    }
+
+    /** @test */
+    function it_gets_a_nav_structure_by_handle()
+    {
+        Nav::shouldReceive('find')->with('test')->once()->andReturn($structure = new Structure);
+        Collection::shouldReceive('find')->never();
+
+        $this->assertSame($structure, $this->repo->find('test'));
+    }
+
+    /** @test */
+    function it_gets_a_collection_structure_by_handle()
+    {
+        $structure = new Structure;
+        $collection = Collection::make()->structure($structure);
+        Collection::shouldReceive('find')->with('test')->once()->andReturn($collection);
+        Nav::shouldReceive('find')->never();
+
+        $this->assertSame($structure, $this->repo->find('collection::test'));
+    }
+
+    /** @test */
+    function it_gets_an_entry_by_uri()
+    {
+        $this->markTestIncomplete();
+    }
+}
diff --git a/tests/Stache/FeatureTest.php b/tests/Stache/FeatureTest.php
index 0b59fe90d32..95def2c76cd 100644
--- a/tests/Stache/FeatureTest.php
+++ b/tests/Stache/FeatureTest.php
@@ -20,6 +20,7 @@
 use Statamic\Stache\Stores\AggregateStore;
 use Statamic\Stache\Stores\CollectionsStore;
 use Statamic\Contracts\Structures\StructureRepository;
+use Statamic\Facades\Nav;
 
 class FeatureTest extends TestCase
 {
@@ -32,7 +33,7 @@ public function setUp(): void
             $stache->store('taxonomies')->directory($dir . '/content/taxonomies');
             $stache->store('collections')->directory($dir . '/content/collections');
             $stache->store('entries')->directory($dir . '/content/collections');
-            $stache->store('structures')->directory($dir . '/content/structures');
+            $stache->store('navigation')->directory($dir . '/content/navigation');
             $stache->store('globals')->directory($dir . '/content/globals');
             $stache->store('asset-containers')->directory($dir . '/content/assets');
             $stache->store('users')->directory($dir . '/users');
@@ -130,6 +131,7 @@ function it_gets_a_user()
     function it_gets_an_entry_by_uri()
     {
         $entry = Entry::findByUri('/numeric/two');
+        $this->assertInstanceOf(\Statamic\Contracts\Entries\Entry::class, $entry);
         $this->assertEquals('numeric-two', $entry->id());
         $this->assertEquals('Two', $entry->get('title'));
 
@@ -140,14 +142,21 @@ function it_gets_an_entry_by_uri()
     function it_gets_an_entry_in_structure_by_uri()
     {
         $entry = Entry::findByUri('/about/board/directors');
+        $this->assertInstanceOf(\Statamic\Structures\Page::class, $entry);
         $this->assertEquals('pages-directors', $entry->id());
         $this->assertEquals('Directors', $entry->title());
     }
 
+    /** @test */
+    function it_returns_null_when_cannot_find_entry_by_uri()
+    {
+        $this->assertNull(Entry::findByUri('/unknown'));
+    }
+
     /** @test */
     function it_gets_structures()
     {
-        $this->assertEquals(2, Structure::all()->count());
+        $this->assertEquals(3, Structure::all()->count());
     }
 
     /** @test */
@@ -158,6 +167,20 @@ function it_gets_a_structure()
         // TODO: Some more assertions
     }
 
+    /** @test */
+    function it_gets_navs()
+    {
+        $this->assertEquals(2, Nav::all()->count());
+    }
+
+    /** @test */
+    function it_gets_a_nav()
+    {
+        $structure = Nav::find('footer');
+        $this->assertEquals('footer', $structure->handle());
+        // TODO: Some more assertions
+    }
+
     /** @test */
     function it_gets_a_collection_structure()
     {
diff --git a/tests/Stache/Repositories/CollectionRepositoryTest.php b/tests/Stache/Repositories/CollectionRepositoryTest.php
index 9e35e26e2c4..3452f6a1f06 100644
--- a/tests/Stache/Repositories/CollectionRepositoryTest.php
+++ b/tests/Stache/Repositories/CollectionRepositoryTest.php
@@ -6,7 +6,7 @@
 use Statamic\Stache\Stache;
 use Statamic\Entries\Collection;
 use Statamic\Stache\Stores\EntriesStore;
-use Statamic\Stache\Stores\StructuresStore;
+use Statamic\Stache\Stores\NavigationStore;
 use Statamic\Stache\Stores\CollectionsStore;
 use Statamic\Facades\Collection as CollectionAPI;
 use Statamic\Stache\Repositories\CollectionRepository;
@@ -24,7 +24,7 @@ public function setUp(): void
         $stache->registerStores([
             (new CollectionsStore($stache, app('files')))->directory($this->directory),
             (new EntriesStore($stache, app('files')))->directory($this->directory),
-            (new StructuresStore($stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/structures'),
+            (new NavigationStore($stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/navigation'),
         ]);
 
         $this->repo = new CollectionRepository($stache);
diff --git a/tests/Stache/Repositories/EntryRepositoryTest.php b/tests/Stache/Repositories/EntryRepositoryTest.php
index bd9fe72821a..f8d71e6b1da 100644
--- a/tests/Stache/Repositories/EntryRepositoryTest.php
+++ b/tests/Stache/Repositories/EntryRepositoryTest.php
@@ -10,7 +10,7 @@
 use Statamic\Stache\Stores\EntriesStore;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Entries\EntryCollection;
-use Statamic\Stache\Stores\StructuresStore;
+use Statamic\Stache\Stores\NavigationStore;
 use Statamic\Stache\Stores\CollectionsStore;
 use Statamic\Stache\Repositories\EntryRepository;
 use Statamic\Exceptions\InvalidLocalizationException;
@@ -29,7 +29,7 @@ public function setUp(): void
         $this->stache->registerStores([
             (new CollectionsStore($this->stache, app('files')))->directory($this->directory),
             (new EntriesStore($this->stache, app('files')))->directory($this->directory),
-            (new StructuresStore($this->stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/structures'),
+            (new NavigationStore($this->stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/navigation'),
         ]);
 
         $this->repo = new EntryRepository($this->stache);
diff --git a/tests/Stache/Repositories/NavigationRepositoryTest.php b/tests/Stache/Repositories/NavigationRepositoryTest.php
new file mode 100644
index 00000000000..3cc02a02963
--- /dev/null
+++ b/tests/Stache/Repositories/NavigationRepositoryTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Stache\Repositories;
+
+use Tests\TestCase;
+use Statamic\Stache\Stache;
+use Illuminate\Support\Collection;
+use Statamic\Stache\Stores\EntriesStore;
+use Statamic\Stache\Stores\NavigationStore;
+use Statamic\Stache\Stores\CollectionsStore;
+use Statamic\Contracts\Structures\Structure;
+use Statamic\Stache\Repositories\NavigationRepository;
+
+class NavigationRepositoryTest extends TestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $stache = (new Stache)->sites(['en']);
+        $this->directory = __DIR__.'/../__fixtures__/content/navigation';
+        $stache->registerStores([
+            (new CollectionsStore($stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/collections'),
+            (new EntriesStore($stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/collections'),
+            (new NavigationStore($stache, app('files')))->directory($this->directory)
+        ]);
+        $this->app->instance(Stache::class, $stache);
+
+        $this->repo = new NavigationRepository($stache);
+    }
+
+    /** @test */
+    function it_gets_all_navs()
+    {
+        $navs = $this->repo->all();
+
+        $this->assertInstanceOf(Collection::class, $navs);
+        $this->assertCount(2, $navs);
+        $this->assertEveryItemIsInstanceOf(Structure::class, $navs);
+
+        $ordered = $navs->sortBy->handle()->values();
+        $this->assertEquals(['footer', 'sidebar'], $ordered->map->handle()->all());
+        $this->assertEquals(['Footer', 'Sidebar'], $ordered->map->title()->all());
+    }
+
+    /** @test */
+    function it_gets_a_nav_by_handle()
+    {
+        tap($this->repo->findByHandle('sidebar'), function ($nav) {
+            $this->assertInstanceOf(Structure::class, $nav);
+            $this->assertEquals('sidebar', $nav->handle());
+            $this->assertEquals('Sidebar', $nav->title());
+        });
+
+        tap($this->repo->findByHandle('footer'), function ($nav) {
+            $this->assertInstanceOf(Structure::class, $nav);
+            $this->assertEquals('footer', $nav->handle());
+            $this->assertEquals('Footer', $nav->title());
+        });
+
+        $this->assertNull($this->repo->findByHandle('unknown'));
+    }
+
+    /** @test */
+    function it_saves_a_nav_to_the_stache_and_to_a_file()
+    {
+        $structure = (new \Statamic\Structures\Structure)->handle('new');
+        $structure->addTree($structure->makeTree('en'));
+
+        $this->assertNull($this->repo->findByHandle('new'));
+
+        $this->repo->save($structure);
+
+        $this->assertNotNull($this->repo->findByHandle('new'));
+        $this->assertFileExists($this->directory.'/new.yaml');
+        @unlink($this->directory.'/new.yaml');
+    }
+}
diff --git a/tests/Stache/Repositories/StructureRepositoryTest.php b/tests/Stache/Repositories/StructureRepositoryTest.php
deleted file mode 100644
index 25c448ea709..00000000000
--- a/tests/Stache/Repositories/StructureRepositoryTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Tests\Stache\Repositories;
-
-use Tests\TestCase;
-use Statamic\Stache\Stache;
-use Illuminate\Support\Collection;
-use Statamic\Stache\Stores\EntriesStore;
-use Statamic\Stache\Stores\StructuresStore;
-use Statamic\Stache\Stores\CollectionsStore;
-use Statamic\Contracts\Structures\Structure;
-use Statamic\Stache\Repositories\StructureRepository;
-
-class StuctureRepositoryTest extends TestCase
-{
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $stache = (new Stache)->sites(['en']);
-        $this->directory = __DIR__.'/../__fixtures__/content/structures';
-        $stache->registerStores([
-            (new CollectionsStore($stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/collections'),
-            (new EntriesStore($stache, app('files')))->directory(__DIR__.'/../__fixtures__/content/collections'),
-            (new StructuresStore($stache, app('files')))->directory($this->directory)
-        ]);
-        $this->app->instance(Stache::class, $stache);
-
-        $this->repo = new StructureRepository($stache);
-    }
-
-    /** @test */
-    function it_gets_all_structures()
-    {
-        $structures = $this->repo->all();
-
-        $this->assertInstanceOf(Collection::class, $structures);
-        $this->assertCount(2, $structures);
-        $this->assertEveryItemIsInstanceOf(Structure::class, $structures);
-
-        $ordered = $structures->sortBy->handle()->values();
-        $this->assertEquals(['collection::pages', 'footer'], $ordered->map->handle()->all());
-        $this->assertEquals(['Pages', 'Footer'], $ordered->map->title()->all());
-    }
-
-    /** @test */
-    function it_gets_a_structure_by_handle()
-    {
-        tap($this->repo->findByHandle('collection::pages'), function ($structure) {
-            $this->assertInstanceOf(Structure::class, $structure);
-            $this->assertEquals('collection::pages', $structure->handle());
-            $this->assertEquals('Pages', $structure->title());
-        });
-
-        tap($this->repo->findByHandle('footer'), function ($structure) {
-            $this->assertInstanceOf(Structure::class, $structure);
-            $this->assertEquals('footer', $structure->handle());
-            $this->assertEquals('Footer', $structure->title());
-        });
-
-        $this->assertNull($this->repo->findByHandle('unknown'));
-    }
-
-    /** @test */
-    function it_saves_a_structure_to_the_stache_and_to_a_file()
-    {
-        $structure = (new \Statamic\Structures\Structure)->handle('new');
-        $structure->addTree($structure->makeTree('en'));
-
-        $this->assertNull($this->repo->findByHandle('new'));
-
-        $this->repo->save($structure);
-
-        $this->assertNotNull($this->repo->findByHandle('new'));
-        $this->assertFileExists($this->directory.'/new.yaml');
-        @unlink($this->directory.'/new.yaml');
-    }
-
-    /** @test */
-    function it_gets_an_entry_by_uri()
-    {
-        $entry = $this->repo->findEntryByUri('/about/board/directors');
-        $this->assertEquals('Directors', $entry->title());
-        $this->assertEquals('/about/board/directors', $entry->uri());
-        $this->assertNull($this->repo->findEntryByUri('/unknown'));
-    }
-}
diff --git a/tests/Stache/Stores/StructuresStoreTest.php b/tests/Stache/Stores/NavigationStoreTest.php
similarity index 90%
rename from tests/Stache/Stores/StructuresStoreTest.php
rename to tests/Stache/Stores/NavigationStoreTest.php
index 7cc0b874126..47121aca018 100644
--- a/tests/Stache/Stores/StructuresStoreTest.php
+++ b/tests/Stache/Stores/NavigationStoreTest.php
@@ -8,11 +8,11 @@
 use Statamic\Stache\Stache;
 use Illuminate\Filesystem\Filesystem;
 use Facades\Statamic\Stache\Traverser;
-use Statamic\Stache\Stores\StructuresStore;
+use Statamic\Stache\Stores\NavigationStore;
 use Statamic\Contracts\Structures\Structure;
 use Statamic\Facades\Path;
 
-class StructuresStoreTest extends TestCase
+class NavigationStoreTest extends TestCase
 {
     function setUp(): void
     {
@@ -21,7 +21,7 @@ function setUp(): void
         mkdir($this->tempDir = __DIR__.'/tmp');
 
         $stache = (new Stache)->sites(['en']);
-        $this->store = (new StructuresStore($stache, app('files')))->directory($this->tempDir);
+        $this->store = (new NavigationStore($stache, app('files')))->directory($this->tempDir);
 
         Facades\Stache::registerStore($this->store);
     }
@@ -63,18 +63,19 @@ function it_makes_structure_instances_from_files()
         $contents = <<<'EOT'
 title: Pages
 route: '{parent_uri}/{slug}'
-root: pages-home
 tree:
   -
-    page: pages-about
+    entry: pages-home
+  -
+    entry: pages-about
     children:
       -
-        page: pages-board
+        entry: pages-board
         children:
           -
-            page: pages-directors
+            entry: pages-directors
   -
-    page: pages-blog # (/blog)
+    entry: pages-blog # (/blog)
 EOT;
         $item = $this->store->makeItemFromFile(Path::tidy($this->tempDir.'/pages.yaml'), $contents);
 
diff --git a/tests/Stache/__fixtures__/content/collections/pages.yaml b/tests/Stache/__fixtures__/content/collections/pages.yaml
index cb3734386f5..d8c15ccee90 100644
--- a/tests/Stache/__fixtures__/content/collections/pages.yaml
+++ b/tests/Stache/__fixtures__/content/collections/pages.yaml
@@ -1,8 +1,10 @@
 title: Pages
 route: '{parent_uri}/{slug}'
 structure:
-  root: pages-home
+  root: true
   tree:
+    -
+      entry: pages-home
     -
       entry: pages-about
       children:
diff --git a/tests/Stache/__fixtures__/content/structures/footer.yaml b/tests/Stache/__fixtures__/content/navigation/footer.yaml
similarity index 100%
rename from tests/Stache/__fixtures__/content/structures/footer.yaml
rename to tests/Stache/__fixtures__/content/navigation/footer.yaml
diff --git a/tests/Stache/__fixtures__/content/navigation/sidebar.yaml b/tests/Stache/__fixtures__/content/navigation/sidebar.yaml
new file mode 100644
index 00000000000..6be10f096aa
--- /dev/null
+++ b/tests/Stache/__fixtures__/content/navigation/sidebar.yaml
@@ -0,0 +1,6 @@
+title: Sidebar
+tree:
+  -
+    entry: pages-contact
+  -
+    entry: pages-about
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 477a582fe52..066ca0ee537 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -93,7 +93,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('statamic.stache.stores.terms.directory', __DIR__.'/__fixtures__/content/taxonomies');
         $app['config']->set('statamic.stache.stores.collections.directory', __DIR__.'/__fixtures__/content/collections');
         $app['config']->set('statamic.stache.stores.entries.directory', __DIR__.'/__fixtures__/content/collections');
-        $app['config']->set('statamic.stache.stores.structures.directory', __DIR__.'/__fixtures__/content/structures');
+        $app['config']->set('statamic.stache.stores.navigation.directory', __DIR__.'/__fixtures__/content/navigation');
         $app['config']->set('statamic.stache.stores.globals.directory', __DIR__.'/__fixtures__/content/globals');
         $app['config']->set('statamic.stache.stores.asset-containers.directory', __DIR__.'/__fixtures__/content/assets');
 

From 6bf964f6498fa722684faf98c76326edc7ed681b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 26 Feb 2020 10:59:30 -0500
Subject: [PATCH 030/137] Nav tag without params defaults to the pages
 collection structure

---
 src/Tags/Nav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tags/Nav.php b/src/Tags/Nav.php
index 143f7e852aa..36d39d1df6b 100644
--- a/src/Tags/Nav.php
+++ b/src/Tags/Nav.php
@@ -6,6 +6,6 @@ class Nav extends Structure
 {
     public function index()
     {
-        return $this->structure($this->get('from', 'pages'));
+        return $this->structure($this->get('from', 'collection::pages'));
     }
 }

From 64db75c1d2a085f8a6c8334c7cd1f624cfe1f29f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 26 Feb 2020 11:00:10 -0500
Subject: [PATCH 031/137] Structure and nav tags can specify collections when
 using shorthand

---
 src/Tags/Structure.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Tags/Structure.php b/src/Tags/Structure.php
index 9a70f1b9a47..c197b36f804 100644
--- a/src/Tags/Structure.php
+++ b/src/Tags/Structure.php
@@ -11,7 +11,10 @@ class Structure extends Tags
 {
     public function wildcard($tag)
     {
-        return $this->structure($tag);
+        // Allow {{ structure:collection:pages }} rather than needing to use the double colon.
+        $handle = str_replace(':', '::', $tag);
+
+        return $this->structure($handle);
     }
 
     public function index()

From 8dc1272edb00f096f003de5f1038810fcc981246 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 27 Feb 2020 10:44:53 -0500
Subject: [PATCH 032/137] Nav/structure tweakies ...

- Structure is abstract
- Created Nav and CollectionStructure classes that both extend Structure
- Tree things (eg. getting routes) delegate to structure
- structures urls are now navigation
- collection structures cannot have handles or titles set, instead they just get them from the collection
- structure policy is now nav policy
- structure vue components become nav vue components.
---
 resources/js/app.js                           |   8 +-
 .../{structures => navigation}/CreateForm.vue |   0
 .../{structures => navigation}/EditForm.vue   |   0
 .../{structures => navigation}/Listing.vue    |   0
 .../{structures => navigation}/View.vue       |   2 +-
 resources/views/navigation/create.blade.php   |   8 +
 .../{structures => navigation}/edit.blade.php |  10 +-
 .../index.blade.php                           |  16 +-
 resources/views/navigation/show.blade.php     |  19 +++
 resources/views/structures/create.blade.php   |   8 -
 resources/views/structures/show.blade.php     |  19 ---
 routes/cp.php                                 |   2 +-
 src/CP/Navigation/CoreNav.php                 |   8 +-
 src/Contracts/Structures/Nav.php              |   8 +
 .../Structures/NavigationRepository.php       |  10 +-
 src/Entries/Collection.php                    |   8 +-
 ...ontroller.php => NavigationController.php} | 155 ++++++------------
 .../{StructurePolicy.php => NavPolicy.php}    |  24 +--
 src/Providers/AuthServiceProvider.php         |   2 +-
 .../Repositories/NavigationRepository.php     |  22 +--
 src/Stache/Stores/NavigationStore.php         |   2 +-
 src/Structures/CollectionStructure.php        |  79 +++++++++
 src/Structures/Nav.php                        |  86 ++++++++++
 src/Structures/Page.php                       |   2 +-
 src/Structures/Structure.php                  | 127 +++-----------
 src/Structures/Tree.php                       |  68 +++-----
 tests/Data/Entries/CollectionTest.php         |   7 +-
 .../Structures/CollectionStructureTest.php    | 133 +++++++++++++++
 tests/Data/Structures/NavTest.php             | 102 ++++++++++++
 tests/Data/Structures/PageTest.php            |  16 +-
 .../Structures/StructureRepositoryTest.php    |  23 +--
 tests/Data/Structures/StructureTest.php       |  59 -------
 tests/Data/Structures/StructureTestCase.php   |  80 +++++++++
 tests/Data/Structures/TreeTest.php            | 140 ++++++++--------
 .../ShowStructuredCollectionTest.php          |   5 +-
 .../Navigation/CreateNavigationTest.php       |  48 ++++++
 .../Navigation/DeleteNavigationTest.php       |  63 +++++++
 .../Feature/Navigation/EditNavigationTest.php |  57 +++++++
 tests/Feature/Navigation/MocksStructures.php  |  33 ++++
 .../Navigation/StoreNavigationTest.php        | 103 ++++++++++++
 .../Navigation/UpdateNavigationTest.php       | 112 +++++++++++++
 .../ViewNavigationListingTest.php}            | 106 ++++++------
 .../Feature/Structures/EditStructureTest.php  |  69 --------
 tests/Feature/Structures/MocksStructures.php  |  47 ------
 .../Repositories/NavigationRepositoryTest.php |   2 +-
 tests/Stache/Stores/NavigationStoreTest.php   |  17 +-
 46 files changed, 1244 insertions(+), 671 deletions(-)
 rename resources/js/components/{structures => navigation}/CreateForm.vue (100%)
 rename resources/js/components/{structures => navigation}/EditForm.vue (100%)
 rename resources/js/components/{structures => navigation}/Listing.vue (100%)
 rename resources/js/components/{structures => navigation}/View.vue (98%)
 create mode 100644 resources/views/navigation/create.blade.php
 rename resources/views/{structures => navigation}/edit.blade.php (51%)
 rename resources/views/{structures => navigation}/index.blade.php (68%)
 create mode 100644 resources/views/navigation/show.blade.php
 delete mode 100644 resources/views/structures/create.blade.php
 delete mode 100644 resources/views/structures/show.blade.php
 create mode 100644 src/Contracts/Structures/Nav.php
 rename src/Http/Controllers/CP/Structures/{StructuresController.php => NavigationController.php} (52%)
 rename src/Policies/{StructurePolicy.php => NavPolicy.php} (54%)
 create mode 100644 src/Structures/CollectionStructure.php
 create mode 100644 src/Structures/Nav.php
 create mode 100644 tests/Data/Structures/CollectionStructureTest.php
 create mode 100644 tests/Data/Structures/NavTest.php
 delete mode 100644 tests/Data/Structures/StructureTest.php
 create mode 100644 tests/Data/Structures/StructureTestCase.php
 create mode 100644 tests/Feature/Navigation/CreateNavigationTest.php
 create mode 100644 tests/Feature/Navigation/DeleteNavigationTest.php
 create mode 100644 tests/Feature/Navigation/EditNavigationTest.php
 create mode 100644 tests/Feature/Navigation/MocksStructures.php
 create mode 100644 tests/Feature/Navigation/StoreNavigationTest.php
 create mode 100644 tests/Feature/Navigation/UpdateNavigationTest.php
 rename tests/Feature/{Structures/ViewStructureListingTest.php => Navigation/ViewNavigationListingTest.php} (58%)
 delete mode 100644 tests/Feature/Structures/EditStructureTest.php
 delete mode 100644 tests/Feature/Structures/MocksStructures.php

diff --git a/resources/js/app.js b/resources/js/app.js
index 0ae306a4f24..2a665fe2758 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -129,10 +129,10 @@ Statamic.app({
         CollectionEditForm: require('./components/collections/EditForm.vue').default,
         CollectionView: require('./components/collections/View.vue').default,
         SessionExpiry: require('./components/SessionExpiry.vue').default,
-        StructureListing: require('./components/structures/Listing.vue').default,
-        StructureCreateForm: require('./components/structures/CreateForm.vue').default,
-        StructureEditForm: require('./components/structures/EditForm.vue').default,
-        StructureView: require('./components/structures/View.vue').default,
+        NavigationListing: require('./components/navigation/Listing.vue').default,
+        NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
+        NavigationEditForm: require('./components/navigation/EditForm.vue').default,
+        NavigationView: require('./components/navigation/View.vue').default,
         Stacks: require('./components/stacks/Stacks.vue').default,
         TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
         TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
diff --git a/resources/js/components/structures/CreateForm.vue b/resources/js/components/navigation/CreateForm.vue
similarity index 100%
rename from resources/js/components/structures/CreateForm.vue
rename to resources/js/components/navigation/CreateForm.vue
diff --git a/resources/js/components/structures/EditForm.vue b/resources/js/components/navigation/EditForm.vue
similarity index 100%
rename from resources/js/components/structures/EditForm.vue
rename to resources/js/components/navigation/EditForm.vue
diff --git a/resources/js/components/structures/Listing.vue b/resources/js/components/navigation/Listing.vue
similarity index 100%
rename from resources/js/components/structures/Listing.vue
rename to resources/js/components/navigation/Listing.vue
diff --git a/resources/js/components/structures/View.vue b/resources/js/components/navigation/View.vue
similarity index 98%
rename from resources/js/components/structures/View.vue
rename to resources/js/components/navigation/View.vue
index fd9693fe8d1..1e1a0f39abd 100644
--- a/resources/js/components/structures/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import PageTree from './PageTree.vue';
+import PageTree from '../structures/PageTree.vue';
 
 export default {
 
diff --git a/resources/views/navigation/create.blade.php b/resources/views/navigation/create.blade.php
new file mode 100644
index 00000000000..e9b6a720e16
--- /dev/null
+++ b/resources/views/navigation/create.blade.php
@@ -0,0 +1,8 @@
+@extends('statamic::layout')
+@section('title', __('Create Navigation'))
+
+@section('content')
+    <navigation-create-form
+        route="{{ cp_route('navigation.store') }}">
+    </navigation-create-form>
+@stop
diff --git a/resources/views/structures/edit.blade.php b/resources/views/navigation/edit.blade.php
similarity index 51%
rename from resources/views/structures/edit.blade.php
rename to resources/views/navigation/edit.blade.php
index abd2b849eec..d520abba731 100644
--- a/resources/views/structures/edit.blade.php
+++ b/resources/views/navigation/edit.blade.php
@@ -3,13 +3,13 @@
 
 @section('content')
 
-    <structure-edit-form
-        initial-title="{{ $structure->title() }}"
+    <navigation-edit-form
+        initial-title="{{ $nav->title() }}"
         :blueprint="{{ json_encode($blueprint) }}"
         :initial-values="{{ json_encode($values) }}"
         :meta="{{ json_encode($meta) }}"
-        url="{{ cp_route('structures.update', $structure->handle()) }}"
-        listing-url="{{ cp_route('structures.index')}}"
-    ></structure-edit-form>
+        url="{{ $nav->showUrl() }}"
+        listing-url="{{ cp_route('navigation.index') }}"
+    ></navigation-edit-form>
 
 @endsection
diff --git a/resources/views/structures/index.blade.php b/resources/views/navigation/index.blade.php
similarity index 68%
rename from resources/views/structures/index.blade.php
rename to resources/views/navigation/index.blade.php
index 69d36b43704..e1385225f58 100644
--- a/resources/views/structures/index.blade.php
+++ b/resources/views/navigation/index.blade.php
@@ -3,28 +3,28 @@
 
 @section('content')
 
-    @unless($structures->isEmpty())
+    @unless($navs->isEmpty())
 
         <header class="flex items-center justify-between mb-3">
             <h1>{{ __('Navigation') }}</h1>
 
             @can('create', 'Statamic\Contracts\Structures\Structure')
-                <a href="{{ cp_route('structures.create') }}" class="btn-primary">{{ __('Create Navigation') }}</a>
+                <a href="{{ cp_route('navigation.create') }}" class="btn-primary">{{ __('Create Navigation') }}</a>
             @endcan
         </header>
 
-        <structure-listing
-            :initial-rows="{{ json_encode($structures) }}">
-        </structure-listing>
+        <navigation-listing
+            :initial-rows="{{ json_encode($navs) }}">
+        </navigation-listing>
 
     @else
 
         @include('statamic::partials.create-first', [
-            'resource' => 'Structure',
+            'resource' => 'Navigation',
             'description' => 'Structures are hierarchical arrangements of your content, most often used to represent forms of site navigation.',
             'svg' => 'empty/structure',
-            'route' => cp_route('structures.create'),
-            'can' => $user->can('create', 'Statamic\Contracts\Structures\Structure')
+            'route' => cp_route('navigation.create'),
+            'can' => $user->can('create', 'Statamic\Contracts\Structures\Nav')
         ])
 
     @endunless
diff --git a/resources/views/navigation/show.blade.php b/resources/views/navigation/show.blade.php
new file mode 100644
index 00000000000..4178fea326f
--- /dev/null
+++ b/resources/views/navigation/show.blade.php
@@ -0,0 +1,19 @@
+@inject('str', 'Statamic\Support\Str')
+@extends('statamic::layout')
+@section('title', Statamic::crumb($nav->title(), 'Navigation'))
+
+@section('content')
+
+    <navigation-view
+        title="{{ $nav->title() }}"
+        breadcrumb-url="{{ cp_route('navigation.index') }}"
+        pages-url="{{ cp_route('structures.pages.index', $nav->handle()) }}"
+        submit-url="{{ cp_route('structures.pages.store', $nav->handle()) }}"
+        edit-url="{{ $nav->editUrl() }}"
+        site="{{ $site }}"
+        :collections="{{ json_encode($collections) }}"
+        :max-depth="{{ $nav->maxDepth() ?? 'Infinity' }}"
+        :expects-root="{{ $str::bool($expectsRoot) }}"
+    ></navigation-view>
+
+@endsection
diff --git a/resources/views/structures/create.blade.php b/resources/views/structures/create.blade.php
deleted file mode 100644
index 3c493553f91..00000000000
--- a/resources/views/structures/create.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-@extends('statamic::layout')
-@section('title', __('Create Navigation'))
-
-@section('content')
-    <structure-create-form
-        route="{{ cp_route('structures.store') }}">
-    </structure-create-form>
-@stop
diff --git a/resources/views/structures/show.blade.php b/resources/views/structures/show.blade.php
deleted file mode 100644
index b3280886e3e..00000000000
--- a/resources/views/structures/show.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@inject('str', 'Statamic\Support\Str')
-@extends('statamic::layout')
-@section('title', Statamic::crumb($structure->title(), 'Navigation'))
-
-@section('content')
-
-    <structure-view
-        title="{{ $structure->title() }}"
-        breadcrumb-url="{{ cp_route('structures.index') }}"
-        pages-url="{{ cp_route('structures.pages.index', $structure->handle()) }}"
-        submit-url="{{ cp_route('structures.pages.store', $structure->handle()) }}"
-        edit-url="{{ cp_route('structures.edit', $structure->handle()) }}"
-        site="{{ $site }}"
-        :collections="{{ json_encode($collections) }}"
-        :max-depth="{{ $structure->maxDepth() ?? 'Infinity' }}"
-        :expects-root="{{ $str::bool($expectsRoot) }}"
-    ></structure-view>
-
-@endsection
diff --git a/routes/cp.php b/routes/cp.php
index 5bb2cb0f508..c61661f8120 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -27,7 +27,7 @@
     Route::get('select-site/{handle}', 'SelectSiteController@select');
 
     Route::group(['namespace' => 'Structures'], function () {
-        Route::resource('structures', 'StructuresController');
+        Route::resource('navigation', 'NavigationController');
         Route::resource('structures.pages', 'StructurePagesController', ['only' => ['index', 'store']]);
     });
 
diff --git a/src/CP/Navigation/CoreNav.php b/src/CP/Navigation/CoreNav.php
index 6789b11c583..c23ee44404a 100644
--- a/src/CP/Navigation/CoreNav.php
+++ b/src/CP/Navigation/CoreNav.php
@@ -11,7 +11,7 @@
 use Statamic\Contracts\Forms\Form;
 use Statamic\Facades\Taxonomy as TaxonomyAPI;
 use Statamic\Facades\GlobalSet as GlobalSetAPI;
-use Statamic\Facades\Structure as StructureAPI;
+use Statamic\Facades\Nav as NavAPI;
 use Statamic\Facades\UserGroup as UserGroupAPI;
 use Statamic\Facades\Collection as CollectionAPI;
 use Statamic\Contracts\Globals\GlobalSet;
@@ -80,13 +80,11 @@ protected function makeContentSection()
             });
 
         Nav::content('Navigation')
-            ->route('structures.index')
+            ->route('navigation.index')
             ->icon('hierarchy-files')
             ->can('index', Structure::class)
             ->children(function () {
-                return StructureAPI::all()->reject(function ($structure) {
-                    return $structure->isCollectionBased();
-                })->map(function ($structure) {
+                return NavAPI::all()->map(function ($structure) {
                     return Nav::item($structure->title())
                               ->url($structure->showUrl())
                               ->can('view', $structure);
diff --git a/src/Contracts/Structures/Nav.php b/src/Contracts/Structures/Nav.php
new file mode 100644
index 00000000000..7cf3b8748ad
--- /dev/null
+++ b/src/Contracts/Structures/Nav.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Statamic\Contracts\Structures;
+
+interface Nav
+{
+
+}
diff --git a/src/Contracts/Structures/NavigationRepository.php b/src/Contracts/Structures/NavigationRepository.php
index 703ab9a7ad5..e93c825a86c 100644
--- a/src/Contracts/Structures/NavigationRepository.php
+++ b/src/Contracts/Structures/NavigationRepository.php
@@ -3,13 +3,13 @@
 namespace Statamic\Contracts\Structures;
 
 use Illuminate\Support\Collection;
-use Statamic\Contracts\Structures\Structure;
+use Statamic\Contracts\Structures\Nav;
 
 interface NavigationRepository
 {
     public function all(): Collection;
-    public function find($id): ?Structure;
-    public function findByHandle($handle): ?Structure;
-    public function save(Structure $structure);
-    public function make(string $handle = null): Structure;
+    public function find($id): ?Nav;
+    public function findByHandle($handle): ?Nav;
+    public function save(Nav $nav);
+    public function make(string $handle = null): Nav;
 }
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 81f9f349716..c59c5c5eac8 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -14,6 +14,7 @@
 use Statamic\Facades\Stache;
 use Statamic\Facades\Structure;
 use Statamic\Facades\Taxonomy;
+use Statamic\Structures\CollectionStructure;
 use Statamic\Support\Arr;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
@@ -511,9 +512,7 @@ public function structure($structure = null)
                 return $structure;
             })
             ->setter(function ($structure) {
-                return $structure
-                    ->handle('collection::'.$this->handle)
-                    ->title($this->title());
+                return $structure->collection($this);
             })
             ->args(func_get_args());
     }
@@ -527,9 +526,8 @@ public function structureContents(array $contents = null)
 
     protected function makeStructureFromContents()
     {
-        $structure = Structure::make('collection::'.$this->handle)
+        $structure = (new CollectionStructure)
             ->collection($this)
-            ->title($this->title())
             ->expectsRoot($this->structureContents['root'] ?? false);
 
         $trees = $this->structureContents['trees']
diff --git a/src/Http/Controllers/CP/Structures/StructuresController.php b/src/Http/Controllers/CP/Structures/NavigationController.php
similarity index 52%
rename from src/Http/Controllers/CP/Structures/StructuresController.php
rename to src/Http/Controllers/CP/Structures/NavigationController.php
index e8feb20b1f7..8b4b492c24c 100644
--- a/src/Http/Controllers/CP/Structures/StructuresController.php
+++ b/src/Http/Controllers/CP/Structures/NavigationController.php
@@ -7,51 +7,51 @@
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Structure;
 use Illuminate\Http\Request;
+use Statamic\Contracts\Structures\Nav as NavContract;
 use Statamic\Facades\Collection;
 use Statamic\Facades\User;
 use Statamic\Structures\TreeBuilder;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Contracts\Structures\Structure as StructureContract;
+use Statamic\Facades\Nav;
 
-class StructuresController extends CpController
+class NavigationController extends CpController
 {
     public function index()
     {
-        $this->authorize('index', StructureContract::class, 'You are not authorized to view any structures.');
+        $this->authorize('index', NavContract::class, 'You are not authorized to view any navs.');
 
-        $structures = Structure::all()->filter(function ($structure) {
-            return !$structure->isCollectionBased() && User::current()->can('view', $structure);
+        $navs = Nav::all()->filter(function ($nav) {
+            return User::current()->can('view', $nav);
         })->map(function ($structure) {
             $tree = $structure->in(Site::selected()->handle());
 
             return [
                 'id' => $structure->handle(),
                 'title' => $structure->title(),
-                'show_url' => $tree->editUrl(),
+                'show_url' => $tree->showUrl(),
                 'edit_url' => $structure->editUrl(),
                 'delete_url' => $structure->deleteUrl(),
                 'deleteable' => User::current()->can('delete', $structure)
             ];
         })->values();
 
-        return view('statamic::structures.index', compact('structures'));
+        return view('statamic::navigation.index', compact('navs'));
     }
 
-    public function edit($structure)
+    public function edit($nav)
     {
-        $structure = Structure::find($structure);
+        $nav = Nav::find($nav);
 
-        abort_if($structure->isCollectionBased(), 404);
-
-        $this->authorize('edit', $structure, 'You are not authorized to edit this structure.');
+        $this->authorize('edit', $nav, 'You are not authorized to configure navs.');
 
         $values = [
-            'title' => $structure->title(),
-            'handle' => $structure->handle(),
-            'collections' => $structure->collections()->map->handle()->all(),
-            'expects_root' => $structure->expectsRoot(),
-            'sites' => Site::all()->map(function ($site) use ($structure) {
-                $tree = $structure->in($site->handle());
+            'title' => $nav->title(),
+            'handle' => $nav->handle(),
+            'collections' => $nav->collections()->map->handle()->all(),
+            'root' => $nav->expectsRoot(),
+            'sites' => Site::all()->map(function ($site) use ($nav) {
+                $tree = $nav->in($site->handle());
                 return [
                     'name' => $site->name(),
                     'handle' => $site->handle(),
@@ -62,48 +62,36 @@ public function edit($structure)
             })->values()->all()
         ];
 
-        $fields = ($blueprint = $this->editFormBlueprint($structure))
+        $fields = ($blueprint = $this->editFormBlueprint($nav))
             ->fields()
             ->addValues($values)
             ->preProcess();
 
-        return view('statamic::structures.edit', [
+        return view('statamic::navigation.edit', [
             'blueprint' => $blueprint->toPublishArray(),
             'values' => $fields->values(),
             'meta' => $fields->meta(),
-            'structure' => $structure,
+            'nav' => $nav,
         ]);
     }
 
-    public function show(Request $request, $structure)
+    public function show(Request $request, $nav)
     {
-        $structure = Structure::find($structure);
-
-        abort_if($structure->isCollectionBased(), 404);
+        $nav = Nav::find($nav);
 
         $site = $request->site ?? Site::selected()->handle();
 
-        if (! $structure || ! $tree = $structure->in($site)) {
+        if (! $nav || ! $tree = $nav->in($site)) {
             return abort(404);
         }
 
-        $blueprints = $structure->isCollectionBased()
-            ? $structure->collection()->entryBlueprints()->map(function ($blueprint) {
-                return [
-                    'handle' => $blueprint->handle(),
-                    'title' => $blueprint->title(),
-                ];
-            }) : collect();
-
-        return view('statamic::structures.show', [
+        return view('statamic::navigation.show', [
             'site' => $site,
-            'structure' => $structure,
-            'expectsRoot' => $structure->expectsRoot(),
-            'hasCollection' => $structure->isCollectionBased(),
-            'collections' => $structure->collections()->map->handle()->all(),
-            'collectionBlueprints' => $blueprints,
-            'localizations' => $structure->sites()->map(function ($handle) use ($structure, $tree) {
-                $localized = $structure->in($handle);
+            'nav' => $nav,
+            'expectsRoot' => $nav->expectsRoot(),
+            'collections' => $nav->collections()->map->handle()->all(),
+            'localizations' => $nav->sites()->map(function ($handle) use ($nav, $tree) {
+                $localized = $nav->in($handle);
                 $exists = $localized !== null;
                 if (!$exists) {
                     return null;
@@ -119,79 +107,72 @@ public function show(Request $request, $structure)
         ]);
     }
 
-    public function update(Request $request, $structure)
+    public function update(Request $request, $nav)
     {
-        $fields = $this->editFormBlueprint()->fields()->addValues($request->all());
+        $nav = Nav::find($nav);
 
-        $fields->validate();
+        $this->authorize('update', $nav, 'You are not authorized to configure navs.');
 
-        $structure = Structure::find($structure);
-
-        abort_if($structure->isCollectionBased(), 404);
-
-        $this->authorize('update', $structure, 'You are not authorized to edit this structure.');
+        $fields = $this->editFormBlueprint()->fields()->addValues($request->all());
 
-        $expectedRoot = $structure->expectsRoot();
+        $fields->validate();
 
         $values = $fields->process()->values()->all();
 
-        $structure
+        $nav
             ->title($values['title'])
-            ->handle($values['handle'])
-            ->expectsRoot($expectsRoot = $values['expects_root'])
+            ->expectsRoot($values['root'])
             ->collections($values['collections'])
             ->maxDepth($values['max_depth']);
 
         $sites = $values['sites'] ?? [];
 
         if (!empty($sites)) {
-            $structure->sites($sites->filter->enabled->map->handle->values()->all());
+            $nav->sites($sites->filter->enabled->map->handle->values()->all());
         }
 
         foreach ($sites as $site) {
-            $tree = $structure->in($site['handle']);
+            $tree = $nav->in($site['handle']);
 
             if ($tree && !$site['enabled']) {
-                $structure->removeTree($tree);
+                $nav->removeTree($tree);
             }
 
             if (!$tree && $site['enabled']) {
-                $tree = $structure->makeTree($site['handle']);
+                $tree = $nav->makeTree($site['handle']);
             }
 
             if (!$site['enabled']) {
                 continue;
             }
 
-            $structure->addTree($tree);
+            $nav->addTree($tree);
         }
 
-        $this->updateRootExpectations($structure, $expectedRoot, $expectsRoot);
-
-        $structure->save();
+        $nav->save();
 
         return [
-            'title' => $structure->title(),
+            'title' => $nav->title(),
         ];
     }
 
     public function create()
     {
-        $this->authorize('create', Structure::class, 'You are not authorized to create structures.');
+        $this->authorize('create', NavContract::class, 'You are not authorized to configure navs.');
 
-        return view('statamic::structures.create');
+        return view('statamic::navigation.create');
     }
 
     public function store(Request $request)
     {
-        $this->authorize('store', Structure::class, 'You are not authorized to create structures.');
+        $this->authorize('store', NavContract::class, 'You are not authorized to configure navs.');
 
         $values = $request->validate([
             'title' => 'required',
             'handle' => 'required|alpha_dash',
         ]);
 
-        $structure = Structure::make()
+        $structure = Nav::make()
             ->title($values['title'])
             ->handle($values['handle']);
 
@@ -202,36 +183,6 @@ public function store(Request $request)
         return ['redirect' => $structure->showUrl()];
     }
 
-    protected function updateRootExpectations($structure, $expected, $expecting)
-    {
-        if ($expected === $expecting) {
-            return;
-        }
-
-        $structure->trees()->each(function ($tree) use ($expecting) {
-            return $expecting
-                ? $this->moveFirstPageToRoot($tree)
-                : $this->moveRootToFirstPage($tree);
-        });
-    }
-
-    protected function moveFirstPageToRoot($tree)
-    {
-        $arr = $tree->tree();
-        $first = Arr::pull($arr, 0);
-        $tree
-            ->tree(array_values($arr))
-            ->root($first['entry']);
-    }
-
-    protected function moveRootToFirstPage($tree)
-    {
-        $root = $tree->root();
-        $arr = $tree->tree();
-        array_unshift($arr, ['entry' => $root]);
-        $tree->root(null)->tree($arr);
-    }
-
     public function editFormBlueprint()
     {
         $contents = [
@@ -257,7 +208,7 @@ public function editFormBlueprint()
                         'instructions' => 'You will be able to add links to entries from these collections.',
                         'mode' => 'select',
                     ],
-                    'expects_root' => [
+                    'root' => [
                         'type' => 'toggle',
                         'display' => 'Expect a root page',
                         'instructions' => 'The first page in the tree should be considered the "root" or "home" page.',
@@ -282,14 +233,12 @@ public function editFormBlueprint()
         return Blueprint::makeFromSections($contents);
     }
 
-    public function destroy($structure)
+    public function destroy($nav)
     {
-        $structure = Structure::findByHandle($structure);
-
-        abort_if($structure->isCollectionBased(), 404);
+        $nav = Nav::findByHandle($nav);
 
-        $this->authorize('delete', $structure, 'You are not authorized to delete this structure.');
+        $this->authorize('delete', $nav, 'You are not authorized to configure navs.');
 
-        $structure->delete();
+        $nav->delete();
     }
 }
diff --git a/src/Policies/StructurePolicy.php b/src/Policies/NavPolicy.php
similarity index 54%
rename from src/Policies/StructurePolicy.php
rename to src/Policies/NavPolicy.php
index 8a1ee4e4dd7..0481c017415 100644
--- a/src/Policies/StructurePolicy.php
+++ b/src/Policies/NavPolicy.php
@@ -2,16 +2,16 @@
 
 namespace Statamic\Policies;
 
+use Statamic\Facades\Nav;
 use Statamic\Facades\User;
-use Statamic\Facades\Structure;
 
-class StructurePolicy
+class NavPolicy
 {
     public function before($user, $ability)
     {
         $user = User::fromUser($user);
 
-        if ($user->hasPermission('configure structures')) {
+        if ($user->hasPermission('configure navs')) {
             return true;
         }
     }
@@ -24,8 +24,8 @@ public function index($user)
             return true;
         }
 
-        return ! Structure::all()->filter(function ($structure) use ($user) {
-            return $this->view($user, $structure);
+        return ! Nav::all()->filter(function ($nav) use ($user) {
+            return $this->view($user, $nav);
         })->isEmpty();
     }
 
@@ -39,28 +39,28 @@ public function store($user)
         // handled by before()
     }
 
-    public function view($user, $structure)
+    public function view($user, $nav)
     {
         $user = User::fromUser($user);
 
-        return $user->hasPermission("view {$structure->handle()} structure");
+        return $user->hasPermission("view {$nav->handle()} nav");
     }
 
-    public function edit($user, $structure)
+    public function edit($user, $nav)
     {
         $user = User::fromUser($user);
 
-        return $user->hasPermission("edit {$structure->handle()} structure");
+        return $user->hasPermission("edit {$nav->handle()} nav");
     }
 
-    public function update($user, $structure)
+    public function update($user, $nav)
     {
         $user = User::fromUser($user);
 
-        return $this->edit($user, $structure);
+        return $this->edit($user, $nav);
     }
 
-    public function delete($user, $structure)
+    public function delete($user, $nav)
     {
         // handled by before()
     }
diff --git a/src/Providers/AuthServiceProvider.php b/src/Providers/AuthServiceProvider.php
index 0f1bfbdab59..f76895c9c78 100755
--- a/src/Providers/AuthServiceProvider.php
+++ b/src/Providers/AuthServiceProvider.php
@@ -31,7 +31,7 @@
 class AuthServiceProvider extends ServiceProvider
 {
     protected $policies = [
-        \Statamic\Contracts\Structures\Structure::class => Policies\StructurePolicy::class,
+        \Statamic\Contracts\Structures\Nav::class => Policies\NavPolicy::class,
         \Statamic\Contracts\Entries\Collection::class => Policies\CollectionPolicy::class,
         \Statamic\Contracts\Entries\Entry::class => Policies\EntryPolicy::class,
         \Statamic\Contracts\Taxonomies\Taxonomy::class => Policies\TaxonomyPolicy::class,
diff --git a/src/Stache/Repositories/NavigationRepository.php b/src/Stache/Repositories/NavigationRepository.php
index aa568f35929..f823ad3dc14 100644
--- a/src/Stache/Repositories/NavigationRepository.php
+++ b/src/Stache/Repositories/NavigationRepository.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Collection;
 use Statamic\Contracts\Entries\Entry;
-use Statamic\Contracts\Structures\Structure;
+use Statamic\Contracts\Structures\Nav;
 use Statamic\Contracts\Structures\NavigationRepository as RepositoryContract;
 use Statamic\Facades;
 use Statamic\Stache\Stache;
@@ -29,33 +29,33 @@ public function all(): Collection
         return $this->store->getItems($keys);
     }
 
-    public function find($id): ?Structure
+    public function find($id): ?Nav
     {
         return $this->findByHandle($id);
     }
 
-    public function findByHandle($handle): ?Structure
+    public function findByHandle($handle): ?Nav
     {
         return $this->store->getItem($handle);
     }
 
-    public function save(Structure $structure)
+    public function save(Nav $nav)
     {
-        $this->store->save($structure);
+        $this->store->save($nav);
     }
 
-    public function delete(Structure $structure)
+    public function delete(Nav $nav)
     {
-        $this->store->delete($structure);
+        $this->store->delete($nav);
     }
 
-    public function make(string $handle = null): Structure
+    public function make(string $handle = null): Nav
     {
-        return (new \Statamic\Structures\Structure)->handle($handle);
+        return (new \Statamic\Structures\Nav)->handle($handle);
     }
 
-    public function updateEntryUris(Structure $structure)
+    public function updateEntryUris(Nav $nav)
     {
-        $this->store->index('uri')->updateItem($structure);
+        $this->store->index('uri')->updateItem($nav);
     }
 }
diff --git a/src/Stache/Stores/NavigationStore.php b/src/Stache/Stores/NavigationStore.php
index 958ce5ba342..ba7912278a1 100644
--- a/src/Stache/Stores/NavigationStore.php
+++ b/src/Stache/Stores/NavigationStore.php
@@ -77,7 +77,7 @@ protected function makeMultiSiteStructureFromFile($handle, $path, $data)
 
     protected function makeBaseStructureFromFile($handle, $path, $data)
     {
-        return Facades\Structure::make()
+        return Facades\Nav::make()
             ->handle($handle)
             ->title($data['title'] ?? null)
             ->sites($data['sites'] ?? null)
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
new file mode 100644
index 00000000000..87747d81bac
--- /dev/null
+++ b/src/Structures/CollectionStructure.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Statamic\Structures;
+
+class CollectionStructure extends Structure
+{
+    public function handle($handle = null)
+    {
+        if (func_num_args() === 1) {
+            throw new \LogicException('Handle cannot be set.');
+        }
+
+        if ($collection = $this->collection()) {
+            return 'collection::' . $collection->handle();
+        }
+    }
+
+    public function title($title = null)
+    {
+        if (func_num_args() === 1) {
+            throw new \LogicException('Title cannot be set.');
+        }
+
+        return $this->collection()->title();
+    }
+
+    public function collection($collection = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('collection')
+            ->args(func_get_args());
+    }
+
+    public function entryUri($entry)
+    {
+        $page = $this->in($entry->locale())
+            ->flattenedPages()
+            ->keyBy->reference()
+            ->get($entry->id());
+
+        return optional($page)->uri();
+    }
+
+    public function collections($collections = null)
+    {
+        // return collect([$this->collection]);
+    }
+
+    public function route(string $site): ?string
+    {
+        return is_array($route = $this->collection->route())
+            ? ($route[$site] ?? null)
+            : $route;
+    }
+
+    public function validateTree(array $tree): void
+    {
+        parent::validateTree($tree);
+
+        $entryIds = $this->getEntryIdsFromTree($tree);
+
+        if ($entryId = $entryIds->duplicates()->first()) {
+            throw new \Exception("Duplicate entry [{$entryId}] in [{$this->collection->handle()}] collection's structure.");
+        }
+    }
+
+    protected function getEntryIdsFromTree($tree)
+    {
+        return collect($tree)
+            ->map(function ($item) {
+                return [
+                    'entry' => $item['entry'] ?? null,
+                    'children' => isset($item['children']) ? $this->getEntryIdsFromTree($item['children']) : null
+                ];
+            })
+            ->flatten()
+            ->filter();
+    }
+}
diff --git a/src/Structures/Nav.php b/src/Structures/Nav.php
new file mode 100644
index 00000000000..5d68dec6f55
--- /dev/null
+++ b/src/Structures/Nav.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Statamic\Structures;
+
+use Statamic\Contracts\Structures\Nav as Contract;
+use Statamic\Data\ExistsAsFile;
+use Statamic\Facades;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Site;
+use Statamic\Facades\Stache;
+
+class Nav extends Structure implements Contract
+{
+    use ExistsAsFile;
+
+    protected $collections;
+
+    public function save()
+    {
+        Facades\Nav::save($this);
+
+        return true;
+    }
+
+    public function delete()
+    {
+        Facades\Nav::delete($this);
+
+        return true;
+    }
+
+    public function path()
+    {
+        return vsprintf('%s/%s.yaml', [
+            rtrim(Stache::store('navigation')->directory(), '/'),
+            $this->handle
+        ]);
+    }
+
+    public function fileData()
+    {
+        $data = [
+            'title' => $this->title,
+            'collections' => $this->collections,
+            'max_depth' => $this->maxDepth,
+            'root' => $this->expectsRoot ?: null,
+        ];
+
+        if (Site::hasMultiple()) {
+            $data['sites'] = $this->sites;
+        } else {
+            $data = array_merge($data, $this->in(Site::default()->handle())->fileData());
+        }
+
+        return $data;
+    }
+
+    public function collections($collections = null)
+    {
+        return $this
+            ->fluentlyGetOrSet('collections')
+            ->getter(function ($collections) {
+                return collect($collections)->map(function ($collection) {
+                    return Collection::findByHandle($collection);
+                });
+            })
+            ->args(func_get_args());
+    }
+
+    public function showUrl()
+    {
+        return cp_route('navigation.show', $this->handle());
+    }
+
+    public function editUrl($params = [])
+    {
+        return cp_route('navigation.edit', array_merge($params, [
+            'navigation' => $this->handle()
+        ]));
+    }
+
+    public function deleteUrl()
+    {
+        return cp_route('navigation.destroy', $this->handle());
+    }
+}
diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index ffb0923e495..d9d797ae9c8 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -156,7 +156,7 @@ public function uri()
             return $cached;
         }
 
-        if (! $this->structure()->collection()) {
+        if (! $this->structure() instanceof CollectionStructure) {
             return $uris[$this->reference] = $this->entry()->uri();
         }
 
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index b1230e34202..fd5b1276a53 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -6,25 +6,22 @@
 use Statamic\Support\Str;
 use Statamic\Facades\Site;
 use Statamic\Facades\Entry;
-use Statamic\Facades\Stache;
 use Statamic\Facades\Collection;
-use Statamic\Data\ExistsAsFile;
 use Illuminate\Support\Traits\Tappable;
 use Statamic\Facades\Structure as StructureAPI;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 use Statamic\Contracts\Structures\Structure as StructureContract;
 use Statamic\Facades\Blink;
 
-class Structure implements StructureContract
+abstract class Structure implements StructureContract
 {
-    use FluentlyGetsAndSets, ExistsAsFile, Tappable;
+    use FluentlyGetsAndSets, Tappable;
 
     protected $title;
     protected $handle;
     protected $sites;
     protected $trees;
     protected $collection;
-    protected $collections;
     protected $maxDepth;
     protected $expectsRoot = false;
 
@@ -63,66 +60,6 @@ public function sites($sites = null)
             ->args(func_get_args());
     }
 
-    public function showUrl()
-    {
-        return cp_route('structures.show', $this->handle());
-    }
-
-    public function editUrl()
-    {
-        return cp_route('structures.edit', $this->handle());
-    }
-
-    public function deleteUrl()
-    {
-        return cp_route('structures.destroy', $this->handle());
-    }
-
-    public function save()
-    {
-        StructureAPI::save($this);
-    }
-
-    public function toCacheableArray()
-    {
-        return [
-            'title' => $this->title,
-            'handle' => $this->handle,
-            'sites' => $this->sites,
-            'root' => $this->expectsRoot,
-            'path' => $this->initialPath() ?? $this->path(),
-            'max_depth' => $this->maxDepth,
-            'collections' => $this->collections,
-            'trees' => $this->trees()->map->toCacheableArray()->all()
-        ];
-    }
-
-    public function path()
-    {
-        return vsprintf('%s/%s.yaml', [
-            rtrim(Stache::store('navigation')->directory(), '/'),
-            $this->handle
-        ]);
-    }
-
-    public function fileData()
-    {
-        $data = [
-            'title' => $this->title,
-            'collections' => $this->collections,
-            'max_depth' => $this->maxDepth,
-            'root' => $this->expectsRoot ?: null,
-        ];
-
-        if (Site::hasMultiple()) {
-            $data['sites'] = $this->sites;
-        } else {
-            $data = array_merge($data, $this->in(Site::default()->handle())->fileData());
-        }
-
-        return $data;
-    }
-
     public function expectsRoot($expectsRoot = null)
     {
         return $this->fluentlyGetOrSet('expectsRoot')->args(func_get_args());
@@ -166,58 +103,48 @@ public function in($site)
         return $this->trees[$site] ?? null;
     }
 
-    public function collections($collections = null)
+    abstract public function collections($collections = null);
+
+    public function maxDepth($maxDepth = null)
     {
         return $this
-            ->fluentlyGetOrSet('collections')
-            ->getter(function ($collections) {
-                if ($collection = $this->collection()) {
-                    return collect([$collection]);
-                }
-
-                return collect($collections)->map(function ($collection) {
-                    return Collection::findByHandle($collection);
-                });
-            })
-            ->args(func_get_args());
+            ->fluentlyGetOrSet('maxDepth')
+            ->setter(function ($maxDepth) {
+                return (int) $maxDepth ?: null;
+            })->args(func_get_args());
     }
 
-    public function collection($collection = null)
+    public function validateTree(array $tree): void
     {
-        return $this
-            ->fluentlyGetOrSet('collection')
-            ->args(func_get_args());
+        if (! $this->expectsRoot()) {
+            return;
+        }
+
+        if (!empty($tree) && !isset($tree[0]['entry'])) {
+            throw new \Exception('Root page must be an entry');
+        }
+
+        throw_if(isset($tree[0]['children']), new \Exception('Root page cannot have children'));
     }
 
-    public function isCollectionBased()
+    public function route(string $site): ?string
     {
-        return $this->collection() !== null;
+        return null;
     }
 
-    public function maxDepth($maxDepth = null)
+    public function showUrl()
     {
-        return $this
-            ->fluentlyGetOrSet('maxDepth')
-            ->setter(function ($maxDepth) {
-                return (int) $maxDepth ?: null;
-            })->args(func_get_args());
+        //
     }
 
-    public function delete()
+    public function editUrl($params = [])
     {
-        StructureAPI::delete($this);
-
-        return true;
+        //
     }
 
-    public function entryUri($entry)
+    public function deleteUrl()
     {
-        $page = $this->in($entry->locale())
-            ->flattenedPages()
-            ->keyBy->reference()
-            ->get($entry->id());
-
-        return optional($page)->uri();
+        //
     }
 
     public static function __callStatic($method, $parameters)
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index ffb8bfd92b8..4709d9d36ea 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -5,6 +5,7 @@
 use Statamic\Contracts\Data\Localization;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Facades;
+use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
@@ -31,7 +32,8 @@ public function tree($tree = null)
     {
         return $this->fluentlyGetOrSet('tree')
             ->setter(function ($tree) {
-                return $this->validateTree($tree);
+                $this->structure->validateTree($tree);
+                return $tree;
             })
             ->args(func_get_args());
     }
@@ -57,13 +59,7 @@ public function handle()
 
     public function route()
     {
-        if (! $collection = $this->structure->collection()) {
-            return null;
-        }
-
-        return is_array($route = $collection->route())
-            ? $route[$this->locale()]
-            : $route;
+        return $this->structure->route($this->locale());
     }
 
     public function path()
@@ -160,9 +156,25 @@ protected function removeEmptyChildren($array)
         })->all();
     }
 
+    public function showUrl()
+    {
+        $params = [];
+
+        if (Site::hasMultiple()) {
+            $params['site'] = $this->locale();
+        }
+
+        return $this->structure->showUrl($params);
+    }
+
     public function editUrl()
     {
-        return cp_route('structures.show', ['structure' => $this->handle(), 'site' => $this->locale()]);
+        return $this->structure->editUrl();
+    }
+
+    public function deleteUrl()
+    {
+        return $this->structure->deleteUrl();
     }
 
     public function append($entry)
@@ -249,42 +261,4 @@ private function removeFromInBranches($entry, $branches)
 
         return [$match, array_values($branches)];
     }
-
-    protected function validateTree($tree)
-    {
-        if ($this->structure->expectsRoot()) {
-            throw_unless(isset($tree[0]['entry']), new \Exception('Root page must be an entry'));
-            throw_if(isset($tree[0]['children']), new \Exception('Root page cannot have children'));
-        }
-
-        if (! $this->structure->isCollectionBased()) {
-            return $tree;
-        }
-
-        $entryIds = $this->getEntryIdsFromTree($tree);
-
-        if ($entryId = $entryIds->duplicates()->first()) {
-            $this->throwDuplicateEntryException($entryId);
-        }
-
-        return $tree;
-    }
-
-    private function throwDuplicateEntryException($id)
-    {
-        throw new \Exception("Duplicate entry [{$id}] in [{$this->structure->handle()}] structure.");
-    }
-
-    protected function getEntryIdsFromTree($tree)
-    {
-        return collect($tree)
-            ->map(function ($item) {
-                return [
-                    'entry' => $item['entry'] ?? null,
-                    'children' => isset($item['children']) ? $this->getEntryIdsFromTree($item['children']) : null
-                ];
-            })
-            ->flatten()
-            ->filter();
-    }
 }
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index df63badd810..d7d268cec8a 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -4,13 +4,13 @@
 
 use Facades\Statamic\Fields\BlueprintRepository;
 use Facades\Tests\Factories\EntryFactory;
-use Statamic\Contracts\Structures\Structure as StructureContract;
 use Statamic\Entries\Collection;
 use Statamic\Entries\Entry;
 use Statamic\Facades;
 use Statamic\Facades\Site;
 use Statamic\Facades\Structure;
 use Statamic\Fields\Blueprint;
+use Statamic\Structures\CollectionStructure;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
@@ -311,7 +311,7 @@ function default_publish_state_is_always_false_when_using_revisions()
     /** @test */
     function it_sets_and_gets_structure()
     {
-        $structure = Structure::make();
+        $structure = new CollectionStructure;
         $collection = (new Collection)->handle('test');
         $this->assertFalse($collection->hasStructure());
         $this->assertNull($collection->structure());
@@ -352,9 +352,8 @@ function it_sets_the_structure_inline()
         $this->assertEquals($contents, $collection->structureContents());
         $this->assertTrue($collection->hasStructure());
         $structure = $collection->structure();
-        $this->assertInstanceOf(StructureContract::class, $structure);
+        $this->assertInstanceOf(CollectionStructure::class, $structure);
         $this->assertEquals('collection::test', $structure->handle());
-        $this->assertTrue($structure->isCollectionBased());
         $this->assertSame($collection, $structure->collection());
         $this->assertEquals(2, $structure->in('en')->pages()->all()->count());
         $this->assertEquals(3, $structure->in('en')->flattenedPages()->count());
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
new file mode 100644
index 00000000000..76106eca296
--- /dev/null
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Tests\Data\Structures;
+
+use Statamic\Contracts\Entries\Collection;
+use Statamic\Structures\CollectionStructure;
+
+class CollectionStructureTest extends StructureTestCase
+{
+    function structure($handle = null)
+    {
+        if ($handle !== null) {
+            throw new \Exception('Handle should not be set in the test');
+        }
+
+        return new CollectionStructure;
+    }
+
+    /** @test */
+    function the_handle_comes_from_the_collection()
+    {
+        $collection = $this->mock(Collection::class);
+        $collection->shouldReceive('handle')->once()->andReturn('test');
+
+        $structure = $this->structure()->collection($collection);
+
+        $this->assertEquals('collection::test', $structure->collection($collection)->handle());
+    }
+
+    /** @test */
+    function the_handle_cannot_be_set()
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Handle cannot be set.');
+
+        $this->structure()->handle('test');
+    }
+
+    /** @test */
+    function the_title_comes_from_the_collection()
+    {
+        $collection = $this->mock(Collection::class);
+        $collection->shouldReceive('title')->once()->andReturn('Test');
+
+        $structure = $this->structure()->collection($collection);
+
+        $this->assertEquals('Test', $structure->collection($collection)->title());
+    }
+
+    /** @test */
+    function the_title_cannot_be_set()
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Title cannot be set.');
+
+        $this->structure()->title('test');
+    }
+
+    /** @test */
+    function it_sets_and_gets_the_associated_collection()
+    {
+        $this->markTestIncomplete();
+    }
+
+    /** @test */
+    function the_only_available_collection_is_itself()
+    {
+        $this->markTestIncomplete();
+    }
+
+    /** @test */
+    function collections_cannot_be_set()
+    {
+        $this->markTestIncomplete();
+    }
+
+    /** @test */
+    function it_gets_an_entry_uri()
+    {
+        $this->markTestIncomplete();
+    }
+
+    /** @test */
+    function it_gets_the_route_from_the_collection()
+    {
+        $collection = $this->mock(Collection::class);
+        $collection->shouldReceive('route')->once()->andReturn('/the-route/{slug}');
+
+        $this->assertEquals('/the-route/{slug}', $this->structure()->collection($collection)->route('en'));
+    }
+
+    /** @test */
+    function it_gets_the_route_from_the_collection_when_it_has_multiple()
+    {
+        $collection = $this->mock(Collection::class);
+        $collection->shouldReceive('route')->times(3)->andReturn([
+            'en' => '/en-route',
+            'fr' => '/fr-route',
+        ]);
+
+        $structure = $this->structure()->collection($collection);
+
+        $this->assertEquals('/en-route', $structure->route('en'));
+        $this->assertEquals('/fr-route', $structure->route('fr'));
+        $this->assertNull($structure->route('de'));
+    }
+
+    /** @test */
+    function entries_may_only_appear_in_the_tree_once()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Duplicate entry [123] in [test] collection\'s structure.');
+
+        $collection = $this->mock(Collection::class);
+        $collection->shouldReceive('handle')->once()->andReturn('test');
+
+        $this->structure()
+            ->collection($collection)
+            ->validateTree([
+                [
+                    'entry' => '123',
+                ],
+                [
+                    'entry' => '456',
+                    'children' => [
+                        [
+                            'entry' => '123'
+                        ]
+                    ]
+                ]
+            ]);
+    }
+}
diff --git a/tests/Data/Structures/NavTest.php b/tests/Data/Structures/NavTest.php
new file mode 100644
index 00000000000..3921f5f000a
--- /dev/null
+++ b/tests/Data/Structures/NavTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Tests\Data\Structures;
+
+use Illuminate\Support\Collection as LaravelCollection;
+use Statamic\Contracts\Entries\Collection as StatamicCollection;
+use Statamic\Facades;
+use Statamic\Structures\Nav;
+use Tests\PreventSavingStacheItemsToDisk;
+
+class NavTest extends StructureTestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    function structure($handle = null)
+    {
+        return (new Nav)->handle($handle);
+    }
+
+    /** @test */
+    function it_gets_and_sets_the_handle()
+    {
+        $structure = $this->structure();
+        $this->assertNull($structure->handle());
+
+        $return = $structure->handle('test');
+
+        $this->assertEquals('test', $structure->handle());
+        $this->assertEquals($structure, $return);
+    }
+
+    /** @test */
+    function it_gets_and_sets_the_title()
+    {
+        $structure = $this->structure('test');
+
+        // No title set falls back to uppercased version of the handle
+        $this->assertEquals('Test', $structure->title());
+
+        $return = $structure->title('Explicitly set title');
+
+        $this->assertEquals('Explicitly set title', $structure->title());
+        $this->assertEquals($structure, $return);
+    }
+
+    /** @test */
+    function it_saves_the_nav_through_the_api()
+    {
+        $nav = $this->structure();
+
+        Facades\Nav::shouldReceive('save')->with($nav)->once();
+
+        $this->assertTrue($nav->save());
+    }
+
+    /** @test */
+    function it_deletes_through_the_api()
+    {
+        $nav = $this->structure();
+
+        Facades\Nav::shouldReceive('delete')->with($nav)->once();
+
+        $this->assertTrue($nav->delete());
+    }
+
+    /** @test */
+    function collections_can_be_get_and_set()
+    {
+        $nav = $this->structure();
+        $collectionOne = tap(Facades\Collection::make('one'))->save();
+        $collectionTwo = tap(Facades\Collection::make('two'))->save();
+
+        $collections = $nav->collections();
+        $this->assertInstanceOf(LaravelCollection::class, $collections);
+        $this->assertCount(0, $collections);
+
+        $return = $nav->collections(['one', 'two']);
+
+        $this->assertSame($nav, $return);
+        $collections = $nav->collections();
+        $this->assertInstanceOf(LaravelCollection::class, $collections);
+        $this->assertEveryItemIsInstanceOf(StatamicCollection::class, $collections);
+        $this->assertCount(2, $collections);
+        $this->assertEquals([$collectionOne, $collectionTwo], $collections->all());
+    }
+
+    /** @test */
+    function it_has_cp_urls()
+    {
+        $nav = $this->structure('test');
+
+        $this->assertEquals('http://localhost/cp/navigation/test', $nav->showUrl());
+        $this->assertEquals('http://localhost/cp/navigation/test/edit', $nav->editUrl());
+        $this->assertEquals('http://localhost/cp/navigation/test', $nav->deleteUrl());
+    }
+
+    /** @test */
+    function it_has_no_route()
+    {
+        $this->assertNull($this->structure('test')->route('en'));
+    }
+}
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index 9d15daadc0a..af571fcc6b2 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -2,16 +2,18 @@
 
 namespace Tests\Data\Structures;
 
+use Illuminate\Support\Collection;
 use Mockery;
-use Tests\TestCase;
+use Statamic\Contracts\Structures\Nav;
 use Statamic\Entries\Entry;
-use Illuminate\Support\Collection;
-use Statamic\Structures\Page;
-use Statamic\Structures\Tree;
 use Statamic\Facades\Entry as EntryAPI;
+use Statamic\Structures\CollectionStructure;
+use Statamic\Structures\Page;
 use Statamic\Structures\Pages;
 use Statamic\Structures\Structure;
+use Statamic\Structures\Tree;
 use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
 
 class PageTest extends TestCase
 {
@@ -83,7 +85,7 @@ public function slug($slug = null) {
                 return 'entry-slug';
             }
         };
-        \Statamic\Facades\Collection::make('test')->save();
+        $collection = tap(\Statamic\Facades\Collection::make('test'))->save();
         $entry->collection('test');
 
         $parent = Mockery::mock(Page::class);
@@ -92,7 +94,7 @@ public function slug($slug = null) {
         $parent->shouldReceive('isRoot')->andReturnFalse();
 
         $tree = (new Tree)->structure(
-            $this->mock(Structure::class)->shouldReceive('collection')->andReturnTrue()->getMock()
+            $this->mock(CollectionStructure::class)->shouldReceive('collection')->andReturn($collection)->getMock()
         );
 
         $page = (new Page)
@@ -117,7 +119,7 @@ public function uri() {
         };
 
         $tree = (new Tree)->structure(
-            $this->mock(Structure::class)->shouldReceive('collection')->andReturnFalse()->getMock()
+            $this->mock(Nav::class)
         );
 
         $page = (new Page)
diff --git a/tests/Data/Structures/StructureRepositoryTest.php b/tests/Data/Structures/StructureRepositoryTest.php
index 7b1c92b3286..f7c49ae808c 100644
--- a/tests/Data/Structures/StructureRepositoryTest.php
+++ b/tests/Data/Structures/StructureRepositoryTest.php
@@ -5,6 +5,7 @@
 use Statamic\Contracts\Structures\Structure as StructureContract;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Nav;
+use Statamic\Structures\CollectionStructure;
 use Statamic\Structures\Structure;
 use Statamic\Structures\StructureRepository;
 use Tests\TestCase;
@@ -21,15 +22,16 @@ public function setUp(): void
     /** @test */
     function it_gets_all_structures()
     {
-        Nav::shouldReceive('all')->andReturn(collect([
-            (new Structure)->handle('nav-a'),
-            (new Structure)->handle('nav-b'),
-            (new Structure)->handle('nav-c'),
-        ]));
+        $navs = collect([
+            Nav::make('nav-a'),
+            Nav::make('nav-b'),
+            Nav::make('nav-c'),
+        ]);
+        Nav::shouldReceive('all')->andReturn($navs);
 
         $collections = collect([
-            Collection::make('collection-structure-a')->structure(new Structure),
-            Collection::make('collection-structure-b')->structure(new Structure),
+            Collection::make('collection-structure-a')->structure(new CollectionStructure),
+            Collection::make('collection-structure-b')->structure(new CollectionStructure),
         ]);
         Collection::shouldReceive('whereStructured')->andReturn($collections);
 
@@ -50,16 +52,17 @@ function it_gets_all_structures()
     /** @test */
     function it_gets_a_nav_structure_by_handle()
     {
-        Nav::shouldReceive('find')->with('test')->once()->andReturn($structure = new Structure);
+        $nav = Nav::make();
+        Nav::shouldReceive('find')->with('test')->once()->andReturn($nav);
         Collection::shouldReceive('find')->never();
 
-        $this->assertSame($structure, $this->repo->find('test'));
+        $this->assertSame($nav, $this->repo->find('test'));
     }
 
     /** @test */
     function it_gets_a_collection_structure_by_handle()
     {
-        $structure = new Structure;
+        $structure = new CollectionStructure;
         $collection = Collection::make()->structure($structure);
         Collection::shouldReceive('find')->with('test')->once()->andReturn($collection);
         Nav::shouldReceive('find')->never();
diff --git a/tests/Data/Structures/StructureTest.php b/tests/Data/Structures/StructureTest.php
deleted file mode 100644
index 58ee1558bb6..00000000000
--- a/tests/Data/Structures/StructureTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Tests\Data\Structures;
-
-use Tests\TestCase;
-use Statamic\Facades\Entry;
-use Illuminate\Support\Collection;
-use Statamic\Structures\Page;
-use Statamic\Structures\Pages;
-use Statamic\Structures\Structure;
-use Statamic\Facades\Structure as StructureAPI;
-
-class StructureTest extends TestCase
-{
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $stache = $this->app->make('stache');
-        $dir = __DIR__.'/../../Stache/__fixtures__';
-        $stache->store('collections')->directory($dir . '/content/collections');
-        $stache->store('entries')->directory($dir . '/content/collections');
-    }
-
-    /** @test */
-    function it_gets_and_sets_the_handle()
-    {
-        $structure = new Structure;
-        $this->assertNull($structure->handle());
-
-        $return = $structure->handle('test');
-
-        $this->assertEquals('test', $structure->handle());
-        $this->assertEquals($structure, $return);
-    }
-
-    /** @test */
-    function it_gets_and_sets_the_title()
-    {
-        $structure = (new Structure)->handle('test');
-
-        // No title set falls back to uppercased version of the handle
-        $this->assertEquals('Test', $structure->title());
-
-        $return = $structure->title('Explicitly set title');
-
-        $this->assertEquals('Explicitly set title', $structure->title());
-        $this->assertEquals($structure, $return);
-    }
-
-    /** @test */
-    function it_saves_the_structure_through_the_api()
-    {
-        $structure = new Structure;
-        StructureAPI::shouldReceive('save')->with($structure)->once();
-
-        $structure->save();
-    }
-}
diff --git a/tests/Data/Structures/StructureTestCase.php b/tests/Data/Structures/StructureTestCase.php
new file mode 100644
index 00000000000..21fa7cea6e6
--- /dev/null
+++ b/tests/Data/Structures/StructureTestCase.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Tests\Data\Structures;
+
+use Illuminate\Support\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\Structure as StructureAPI;
+use Statamic\Structures\Page;
+use Statamic\Structures\Pages;
+use Statamic\Structures\Structure;
+use Tests\TestCase;
+
+abstract class StructureTestCase extends TestCase
+{
+    abstract function structure($handle = null);
+
+    /** @test */
+    function the_tree_root_cannot_have_children_when_expecting_root()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Root page cannot have children');
+
+        $this->structure()->expectsRoot(true)->validateTree([
+            [
+                'entry' => '123',
+                'children' => [
+                    [
+                        'entry' => '456'
+                    ]
+                ]
+            ]
+        ]);
+    }
+
+    /** @test */
+    function the_tree_root_can_have_children_when_not_expecting_root()
+    {
+        $this->assertNull($this->structure()->expectsRoot(false)->validateTree([
+            [
+                'entry' => '123',
+                'children' => [
+                    [
+                        'entry' => '456'
+                    ]
+                ]
+            ]
+        ]));
+    }
+
+    /** @test */
+    function the_root_must_be_an_entry_when_expecting_root()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Root page must be an entry');
+
+        $this->structure()->expectsRoot(true)->validateTree([
+            [
+                'title' => 'Not an entry',
+                'url' => '/test',
+            ]
+        ]);
+    }
+
+    /** @test */
+    function the_root_doesnt_need_to_be_an_entry_if_the_tree_is_empty()
+    {
+        $this->assertNull($this->structure()->expectsRoot(true)->validateTree([]));
+    }
+
+    /** @test **/
+    function the_root_doesnt_need_to_be_an_entry_when_not_expecting_root()
+    {
+        $this->assertNull($this->structure()->expectsRoot(false)->validateTree([
+            [
+                'title' => 'Not an entry',
+                'url' => '/test',
+            ]
+        ]));
+    }
+}
diff --git a/tests/Data/Structures/TreeTest.php b/tests/Data/Structures/TreeTest.php
index 15fcbb2a8b5..f24713e118d 100644
--- a/tests/Data/Structures/TreeTest.php
+++ b/tests/Data/Structures/TreeTest.php
@@ -2,16 +2,18 @@
 
 namespace Tests\Data\Structures;
 
-use Tests\TestCase;
-use Tests\UnlinksPaths;
-use Statamic\Facades\Entry;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\Site;
+use Statamic\Facades\Structure as StructureAPI;
+use Statamic\Structures\Nav;
 use Statamic\Structures\Page;
-use Statamic\Structures\Tree;
 use Statamic\Structures\Pages;
 use Statamic\Structures\Structure;
+use Statamic\Structures\Tree;
 use Tests\PreventSavingStacheItemsToDisk;
-use Statamic\Facades\Structure as StructureAPI;
+use Tests\TestCase;
+use Tests\UnlinksPaths;
 
 class TreeTest extends TestCase
 {
@@ -29,25 +31,66 @@ public function setUp(): void
     }
 
     /** @test */
-    function it_gets_the_route_from_the_collection()
+    function it_gets_the_route_from_the_structure()
     {
-        $collection = tap(Collection::make('test-collection')->route('the-uri/{slug}'))->save();
+        $structure = $this->mock(Structure::class);
+        $structure->shouldReceive('route')->with('the-locale')->once()->andReturn('/the-route/{slug}');
+
+        $tree = (new Tree)
+            ->locale('the-locale')
+            ->structure($structure);
 
-        $this->unlinkAfter($collection->path());
+        $this->assertEquals('/the-route/{slug}', $tree->route());
+    }
+
+    /** @test */
+    function it_gets_the_edit_url()
+    {
+        $structure = $this->mock(Structure::class);
+        $structure->shouldReceive('editUrl')->withNoArgs()->once()->andReturn('/edit-url');
 
-        $structure = (new Structure)->handle('test-structure')->collection($collection);
         $tree = (new Tree)->structure($structure);
 
-        $this->assertEquals('the-uri/{slug}', $tree->route());
+        $this->assertEquals('/edit-url', $tree->editUrl());
     }
 
     /** @test */
-    function a_structure_without_a_collection_has_no_route()
+    function it_gets_the_delete_url()
     {
-        $structure = (new Structure)->handle('test-structure');
+        $structure = $this->mock(Structure::class);
+        $structure->shouldReceive('deleteUrl')->withNoArgs()->once()->andReturn('/delete-url');
+
         $tree = (new Tree)->structure($structure);
 
-        $this->assertNull($tree->route());
+        $this->assertEquals('/delete-url', $tree->deleteUrl());
+    }
+
+    /** @test */
+    function it_gets_the_show_url_from_the_structure()
+    {
+        Site::shouldReceive('hasMultiple')->once()->andReturnFalse();
+        $structure = $this->mock(Structure::class);
+        $structure->shouldReceive('showUrl')->with([])->once()->andReturn('/show-url');
+
+        $tree = (new Tree)
+            ->locale('the-locale')
+            ->structure($structure);
+
+        $this->assertEquals('/show-url', $tree->showUrl());
+    }
+
+    /** @test */
+    function it_gets_the_show_url_with_the_site_query_param_when_there_are_multiple_sites()
+    {
+        Site::shouldReceive('hasMultiple')->once()->andReturnTrue();
+        $structure = $this->mock(Structure::class);
+        $structure->shouldReceive('showUrl')->with(['site' => 'the-locale'])->once()->andReturn('/show-url');
+
+        $tree = (new Tree)
+            ->locale('the-locale')
+            ->structure($structure);
+
+        $this->assertEquals('/show-url', $tree->showUrl());
     }
 
     /** @test */
@@ -248,79 +291,24 @@ function it_fixes_indexes_when_moving()
     }
 
     /** @test */
-    function the_root_must_be_an_entry_when_expecting_root()
+    function the_structure_validates_the_tree_when_setting_it()
     {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Root page must be an entry');
+        $structure = $this->mock(Structure::class);
 
-        (new Tree)
-            ->structure((new Structure)->expectsRoot(true))
-            ->tree([
-                [
-                    'title' => 'Not an entry',
-                    'url' => '/test',
-                ]
-            ]);
-    }
-
-    /** @test **/
-    function the_root_doesnt_need_to_be_an_entry_when_not_expecting_root()
-    {
-        $tree = (new Tree)
-            ->structure((new Structure)->expectsRoot(false))
-            ->tree($contents = [
-                [
-                    'title' => 'Not an entry',
-                    'url' => '/test',
-                ]
-            ]);
+        $treeContents = ['the' => 'tree'];
 
-        $this->assertSame($contents, $tree->tree());
-    }
-
-    /** @test */
-    function the_root_cannot_have_children_when_expecting_root()
-    {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Root page cannot have children');
+        $structure->shouldReceive('validateTree')->with($treeContents)->once()->andReturnNull();
 
-        (new Tree)
-            ->structure((new Structure)->expectsRoot(true))
-            ->tree([
-                [
-                    'entry' => '123',
-                    'children' => [
-                        [
-                            'entry' => '456'
-                        ]
-                    ]
-                ]
-            ]);
-    }
-
-    /** @test */
-    function the_root_can_have_children_when_not_expecting_root()
-    {
-        $tree = (new Tree)
-            ->structure((new Structure)->expectsRoot(false))
-            ->tree($contents = [
-                [
-                    'entry' => '123',
-                    'children' => [
-                        [
-                            'entry' => '456'
-                        ]
-                    ]
-                ]
-            ]);
+        $tree = (new Tree)->structure($structure);
 
-        $this->assertSame($contents, $tree->tree());
+        $tree->tree($treeContents);
     }
 
     protected function tree()
     {
         return (new Tree)
-            ->structure((new Structure)->expectsRoot(true))
+            ->locale('en')
+            ->structure((new Nav)->expectsRoot(true))
             ->tree([
                 [
                     'entry' => 'pages-home',
diff --git a/tests/Feature/Collections/ShowStructuredCollectionTest.php b/tests/Feature/Collections/ShowStructuredCollectionTest.php
index d1b89966d54..cb07cc972a7 100644
--- a/tests/Feature/Collections/ShowStructuredCollectionTest.php
+++ b/tests/Feature/Collections/ShowStructuredCollectionTest.php
@@ -3,9 +3,10 @@
 namespace Tests\Feature\Collections;
 
 use Facades\Tests\Factories\EntryFactory;
-use Statamic\Facades\User;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Structure;
+use Statamic\Facades\User;
+use Statamic\Structures\CollectionStructure;
 use Tests\PreventSavingStacheItemsToDisk;
 
 class ShowStructuredCollectionTest extends ShowCollectionTest
@@ -14,7 +15,7 @@ class ShowStructuredCollectionTest extends ShowCollectionTest
 
     function createCollection($handle)
     {
-        $structure = Structure::make()->tap(function ($s) {
+        $structure = (new CollectionStructure)->tap(function ($s) {
             $s->addTree($s->makeTree('en'));
         });
 
diff --git a/tests/Feature/Navigation/CreateNavigationTest.php b/tests/Feature/Navigation/CreateNavigationTest.php
new file mode 100644
index 00000000000..d8ad21b648c
--- /dev/null
+++ b/tests/Feature/Navigation/CreateNavigationTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CreateNavigationTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    function it_shows_the_create_page_if_you_have_permission()
+    {
+        $this->withoutExceptionHandling();
+        $this->setTestRoles(['test' => ['access cp', 'configure navs']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this
+            ->actingAs($user)
+            ->visitCreatePage()
+            ->assertOk()
+            ->assertViewIs('statamic::navigation.create')
+            ->assertSee('Create Navigation');
+    }
+
+    /** @test */
+    function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->visitCreatePage()
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+    }
+
+    function visitCreatePage()
+    {
+        return $this->get(cp_route('navigation.create'));
+    }
+}
diff --git a/tests/Feature/Navigation/DeleteNavigationTest.php b/tests/Feature/Navigation/DeleteNavigationTest.php
new file mode 100644
index 00000000000..2aeaa3612c9
--- /dev/null
+++ b/tests/Feature/Navigation/DeleteNavigationTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Tests\TestCase;
+use Tests\FakesRoles;
+use Statamic\Facades\Nav;
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+
+class DeleteNavigationTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $nav = $this->createNav();
+        $this->assertCount(1, Nav::all());
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->delete(cp_route('navigation.destroy', $nav->handle()))
+            ->assertRedirect('/original')
+            ->assertSessionHas('error', 'You are not authorized to configure navs.');
+
+        $this->assertCount(1, Nav::all());
+    }
+
+    /** @test */
+    function it_deletes_the_navigation()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure navs']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $nav = $this->createNav();
+        $this->assertCount(1, Nav::all());
+
+        $this
+            ->actingAs($user)
+            ->delete(cp_route('navigation.destroy', $nav->handle()))
+            ->assertOk();
+
+        $this->assertCount(0, Nav::all());
+    }
+
+    private function createNav()
+    {
+        return Nav::make('test')
+            ->title('Existing')
+            ->maxDepth(1)
+            ->expectsRoot(false)
+            ->tap(function ($nav) {
+                $nav->addTree($nav->makeTree('en'));
+                $nav->save();
+            });
+    }
+}
diff --git a/tests/Feature/Navigation/EditNavigationTest.php b/tests/Feature/Navigation/EditNavigationTest.php
new file mode 100644
index 00000000000..e23ebcf4e51
--- /dev/null
+++ b/tests/Feature/Navigation/EditNavigationTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Mockery;
+use Statamic\Facades;
+use Statamic\Facades\Nav;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class EditNavigationTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+    use MocksStructures;
+
+    /** @test */
+    function it_shows_the_edit_form_if_user_has_edit_permission()
+    {
+        $nav = $this->createNav('foo');
+        Nav::shouldReceive('all')->andReturn(collect([$nav]));
+        Nav::shouldReceive('find')->andReturn($nav);
+
+        $this->setTestRoles(['test' => ['access cp', 'edit foo nav']]);
+        $user = Facades\User::make()->assignRole('test')->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->visitEditPage($nav)
+            ->assertSuccessful()
+            ->assertViewHas('nav', $nav);
+    }
+
+    /** @test */
+    function it_denies_access_if_user_doesnt_have_edit_permission()
+    {
+        $nav = $this->createNav('foo');
+        Nav::shouldReceive('all')->andReturn(collect([$nav]));
+        Nav::shouldReceive('find')->andReturn($nav);
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+
+        $response = $this
+            ->from('/cp/original')
+            ->actingAs($user)
+            ->visitEditPage($nav)
+            ->assertRedirect('/cp/original')
+            ->assertSessionHas('error', 'You are not authorized to configure navs.');
+    }
+
+    function visitEditPage($nav)
+    {
+        return $this->get(route('statamic.cp.navigation.edit', $nav->handle()));
+    }
+}
diff --git a/tests/Feature/Navigation/MocksStructures.php b/tests/Feature/Navigation/MocksStructures.php
new file mode 100644
index 00000000000..c2f89b69829
--- /dev/null
+++ b/tests/Feature/Navigation/MocksStructures.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Mockery;
+use Statamic\Contracts\Structures\Nav;
+use Statamic\Structures\Tree;
+
+trait MocksStructures
+{
+    private function createNav($handle)
+    {
+        return tap(Mockery::mock(Nav::class), function ($s) use ($handle) {
+            $s->shouldReceive('in')->andReturn($this->createStructureTree($handle));
+            $s->shouldReceive('title')->andReturn($handle);
+            $s->shouldReceive('handle')->andReturn($handle);
+            $s->shouldReceive('showUrl')->andReturn('/nav-show-url');
+            $s->shouldReceive('editUrl')->andReturn('/nav-edit-url');
+            $s->shouldReceive('deleteUrl')->andReturn('/nav-delete-url');
+            $s->shouldReceive('collections')->andReturn(collect());
+            $s->shouldReceive('expectsRoot')->andReturnFalse();
+        });
+    }
+
+    private function createStructureTree($handle)
+    {
+        return tap(Mockery::mock(Tree::class), function ($s) use ($handle) {
+            $s->shouldReceive('showUrl')->andReturn('/tree-show-url');
+            $s->shouldReceive('editUrl')->andReturn('/tree-edit-url');
+            $s->shouldReceive('route')->andReturn('/route');
+        });
+    }
+}
diff --git a/tests/Feature/Navigation/StoreNavigationTest.php b/tests/Feature/Navigation/StoreNavigationTest.php
new file mode 100644
index 00000000000..ff0ce0a0b1b
--- /dev/null
+++ b/tests/Feature/Navigation/StoreNavigationTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Tests\TestCase;
+use Tests\FakesRoles;
+use Statamic\Facades\User;
+use Statamic\Facades\Nav;
+use Tests\PreventSavingStacheItemsToDisk;
+
+class StoreNavigationTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    function it_denies_access_if_you_dont_have_permission()
+    {
+        $this
+            ->from('/original')
+            ->actingAs($this->userWithoutPermission())
+            ->submit()
+            ->assertRedirect('/original')
+            ->assertSessionHas('error', 'You are not authorized to configure navs.');
+    }
+
+    /** @test */
+    function it_stores_a_nav()
+    {
+        $this->assertCount(0, Nav::all());
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->submit($this->validParams())
+            ->assertOk()
+            ->assertJson(['redirect' => cp_route('navigation.show', 'test')]);
+
+        $this->assertCount(1, Nav::all());
+        $nav = Nav::all()->first();
+        $this->assertEquals('test', $nav->handle());
+    }
+
+    /** @test */
+    function title_is_required()
+    {
+        $this->assertCount(0, Nav::all());
+
+        $this
+            ->from('/original')
+            ->actingAs($this->userWithPermission())
+            ->submit($this->validParams([
+                'title' => ''
+            ]))
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('title');
+
+        $this->assertCount(0, Nav::all());
+    }
+
+    /** @test */
+    function handle_must_be_alpha_dash()
+    {
+        $this->assertCount(0, Nav::all());
+
+        $this
+            ->from('/original')
+            ->actingAs($this->userWithPermission())
+            ->submit($this->validParams([
+                'handle' => 'there are spaces in here'
+            ]))
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('handle');
+
+        $this->assertCount(0, Nav::all());
+    }
+
+    private function validParams($overrides = [])
+    {
+        return array_merge([
+            'title' => 'Test Nav',
+            'handle' => 'test',
+        ], $overrides);
+    }
+
+    private function userWithoutPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+
+        return tap(User::make()->assignRole('test'))->save();
+    }
+
+    private function userWithPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure navs']]);
+
+        return tap(User::make()->assignRole('test'))->save();
+    }
+
+    private function submit($params = [])
+    {
+        return $this->post(cp_route('navigation.store'), $params);
+    }
+}
diff --git a/tests/Feature/Navigation/UpdateNavigationTest.php b/tests/Feature/Navigation/UpdateNavigationTest.php
new file mode 100644
index 00000000000..abfd0eff146
--- /dev/null
+++ b/tests/Feature/Navigation/UpdateNavigationTest.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Illuminate\Support\Facades\Event;
+use Statamic\Events\Data\CollectionSaved;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Nav;
+use Statamic\Facades\User;
+use Statamic\Http\Controllers\CP\Structures\NavigationController;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UpdateNavigationTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    function it_denies_access_if_you_dont_have_permission()
+    {
+        $nav = $this->createNav();
+
+        $this
+            ->from('/original')
+            ->actingAs($this->userWithoutPermission())
+            ->submit($nav)
+            ->assertRedirect('/original')
+            ->assertSessionHas('error', 'You are not authorized to configure navs.');
+    }
+
+    /** @test */
+    function it_updates_a_nav()
+    {
+        $nav = $this->createNav();
+        $this->assertCount(1, Nav::all());
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->submit($nav, $this->validParams())
+            ->assertOk()
+            ->assertJson(['title' => 'Updated']);
+
+        $this->assertCount(1, Nav::all());
+        $updated = Nav::all()->first();
+        $this->assertEquals('Updated', $updated->title());
+        $this->assertEquals(2, $updated->maxDepth());
+        $this->assertTrue($updated->expectsRoot());
+    }
+
+    /** @test */
+    function title_is_required()
+    {
+        $nav = $this->createNav();
+        $this->assertCount(1, Nav::all());
+
+        $this
+            ->from('/original')
+            ->actingAs($this->userWithPermission())
+            ->submit($nav, $this->validParams(['title' => '']))
+            ->assertRedirect('/original')
+            ->assertSessionHasErrors('title');
+
+        $this->assertCount(1, Nav::all());
+        $nav = Nav::all()->first();
+        $this->assertEquals('Existing', $nav->title());
+        $this->assertEquals(1, $nav->maxDepth());
+        $this->assertFalse($nav->expectsRoot());
+    }
+
+    private function createNav()
+    {
+        return Nav::make('test')
+            ->title('Existing')
+            ->maxDepth(1)
+            ->expectsRoot(false)
+            ->tap(function ($nav) {
+                $nav->addTree($nav->makeTree('en'));
+                $nav->save();
+            });
+    }
+
+    private function validParams($overrides = [])
+    {
+        return array_merge([
+            'title' => 'Updated',
+            'collections' => ['pages'],
+            'root' => true,
+            'max_depth' => 2
+        ], $overrides);
+    }
+
+    private function userWithoutPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+
+        return tap(User::make()->assignRole('test'))->save();
+    }
+
+    private function userWithPermission()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure navs']]);
+
+        return tap(User::make()->assignRole('test'))->save();
+    }
+
+    private function submit($nav, $params = [])
+    {
+        return $this->patch($nav->showUrl(), $params);
+    }
+}
diff --git a/tests/Feature/Structures/ViewStructureListingTest.php b/tests/Feature/Navigation/ViewNavigationListingTest.php
similarity index 58%
rename from tests/Feature/Structures/ViewStructureListingTest.php
rename to tests/Feature/Navigation/ViewNavigationListingTest.php
index 9056298c0cb..6046e1906bb 100644
--- a/tests/Feature/Structures/ViewStructureListingTest.php
+++ b/tests/Feature/Navigation/ViewNavigationListingTest.php
@@ -1,37 +1,37 @@
 <?php
 
-namespace Tests\Feature\Structures;
+namespace Tests\Feature\Navigation;
 
 use Mockery;
-use Statamic\Facades;
-use Tests\TestCase;
 use Statamic\Auth\User;
-use Statamic\Structures\Tree;
+use Statamic\Contracts\Structures\Nav;
+use Statamic\Facades;
 use Statamic\Structures\Structure;
+use Statamic\Structures\Tree;
 use Tests\PreventSavingStacheItemsToDisk;
-use Tests\Feature\Structures\MocksStructures;
+use Tests\TestCase;
 
-class ViewStructureListingTest extends TestCase
+class ViewNavigationListingTest extends TestCase
 {
-    use PreventSavingStacheItemsToDisk, MocksStructures;
+    use PreventSavingStacheItemsToDisk;
+    use MocksStructures;
 
     /** @test */
     function it_shows_a_list_of_nav_structures()
     {
-        Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createNavStructure('foo'),
-            'bar' => $structureB = $this->createNavStructure('bar'),
-            'baz' => $structureC = $this->createCollectionStructure('baz'),
+        Facades\Nav::shouldReceive('all')->andReturn(collect([
+            'foo' => $structureA = $this->createNav('foo'),
+            'bar' => $structureB = $this->createNav('bar'),
         ]));
 
         $user = Facades\User::make()->makeSuper()->save();
 
-        $response = $this
+        $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
+            ->visitIndex()
             ->assertSuccessful()
-            ->assertViewHas('structures', function ($structures) {
-                return $structures->map->id->all() === ['foo', 'bar'];
+            ->assertViewHas('navs', function ($navs) {
+                return $navs->map->id->all() === ['foo', 'bar'];
             })
             ->assertDontSee('no-results');
     }
@@ -39,33 +39,32 @@ function it_shows_a_list_of_nav_structures()
     /** @test */
     function it_shows_no_results_when_there_are_no_structures()
     {
-        $user = Facades\User::make()->makeSuper()->save();
+        $user = tap(Facades\User::make()->makeSuper())->save();
 
-        $response = $this
+        $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
+            ->visitIndex()
             ->assertSuccessful()
-            ->assertViewHas('structures', collect([]))
+            ->assertViewHas('navs', collect([]))
             ->assertSee('no-results');
     }
 
     /** @test */
     function it_filters_out_structures_the_user_cannot_access()
     {
-        $this->withoutExceptionHandling();
-        Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createNavStructure('foo'),
-            'bar' => $structureB = $this->createNavStructure('bar')
+        Facades\Nav::shouldReceive('all')->andReturn(collect([
+            'foo' => $this->createNav('foo'),
+            'bar' => $this->createNav('bar')
         ]));
-        $this->setTestRoles(['test' => ['access cp', 'view bar structure']]);
+        $this->setTestRoles(['test' => ['access cp', 'view bar nav']]);
         $user = Facades\User::make()->assignRole('test')->save();
 
-        $response = $this
+        $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
+            ->visitIndex()
             ->assertSuccessful()
-            ->assertViewHas('structures', function ($structures) {
-                return $structures->map->id->all() === ['bar'];
+            ->assertViewHas('navs', function ($navs) {
+                return $navs->map->id->all() === ['bar'];
             })
             ->assertDontSee('no-results');
     }
@@ -73,19 +72,19 @@ function it_filters_out_structures_the_user_cannot_access()
     /** @test */
     function it_doesnt_filter_out_structures_if_they_have_permission_to_configure()
     {
-        Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createNavStructure('foo'),
-            'bar' => $structureB = $this->createNavStructure('bar')
+        Facades\Nav::shouldReceive('all')->andReturn(collect([
+            'foo' => $this->createNav('foo'),
+            'bar' => $this->createNav('bar')
         ]));
-        $this->setTestRoles(['test' => ['access cp', 'configure structures', 'view bar structure']]);
+        $this->setTestRoles(['test' => ['access cp', 'configure navs', 'view bar nav']]);
         $user = Facades\User::make()->assignRole('test')->save();
 
-        $response = $this
+        $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
+            ->visitIndex()
             ->assertSuccessful()
-            ->assertViewHas('structures', function ($structures) {
-                return $structures->map->id->all() === ['foo', 'bar'];
+            ->assertViewHas('navs', function ($navs) {
+                return $navs->map->id->all() === ['foo', 'bar'];
             })
             ->assertDontSee('no-results');
     }
@@ -94,8 +93,8 @@ function it_doesnt_filter_out_structures_if_they_have_permission_to_configure()
     function it_denies_access_when_there_are_no_permitted_structures()
     {
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $structureA = $this->createNavStructure('foo'),
-            'bar' => $structureB = $this->createNavStructure('bar')
+            'foo' => $this->createNav('foo'),
+            'bar' => $this->createNav('bar')
         ]));
 
         $this->setTestRoles(['test' => ['access cp']]);
@@ -104,20 +103,20 @@ function it_denies_access_when_there_are_no_permitted_structures()
         $response = $this
             ->from('/cp/original')
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
+            ->visitIndex()
             ->assertRedirect('/cp/original');
     }
 
     /** @test */
     function create_structure_button_is_visible_with_permission_to_configure()
     {
-        $this->setTestRoles(['test' => ['access cp', 'configure structures']]);
+        $this->setTestRoles(['test' => ['access cp', 'configure navs']]);
         $user = Facades\User::make()->assignRole('test')->save();
 
         $response = $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
-            ->assertSee('Create Structure');
+            ->visitIndex()
+            ->assertSee('Create Navigation');
     }
 
     /** @test */
@@ -128,23 +127,23 @@ function create_structure_button_is_not_visible_without_permission_to_configure(
 
         $response = $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
-            ->assertDontSee('Create Structure');
+            ->visitIndex()
+            ->assertDontSee('Create Navigation');
     }
 
     /** @test */
     function delete_button_is_visible_with_permission_to_configure()
     {
         Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $this->createNavStructure('foo'),
+            'foo' => $this->createNav('foo'),
         ]));
 
-        $this->setTestRoles(['test' => ['access cp', 'configure structures']]);
+        $this->setTestRoles(['test' => ['access cp', 'configure navs']]);
         $user = Facades\User::make()->assignRole('test')->save();
 
         $response = $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
+            ->visitIndex()
             ->assertSee('Delete');
     }
 
@@ -153,16 +152,16 @@ function delete_button_is_not_visible_without_permission_to_configure()
     {
         $this->markTestIncomplete();
 
-        Facades\Structure::shouldReceive('all')->andReturn(collect([
-            'foo' => $this->createNavStructure('foo'),
+        Facades\Nav::shouldReceive('all')->andReturn(collect([
+            'foo' => $this->createNav('foo'),
         ]));
 
-        $this->setTestRoles(['test' => ['access cp', 'view foo structure']]);
+        $this->setTestRoles(['test' => ['access cp', 'view foo nav']]);
         $user = Facades\User::make()->assignRole('test');
 
         $response = $this
             ->actingAs($user)
-            ->get(route('statamic.cp.structures.index'))
+            ->visitIndex()
             ->assertDontSee('Delete');
     }
 
@@ -187,4 +186,9 @@ public function all(): \Illuminate\Support\Collection {
         app()->instance(\Statamic\Contracts\Auth\RoleRepository::class, $fake);
         Facades\Role::swap($fake);
     }
+
+    private function visitIndex()
+    {
+        return $this->get(route('statamic.cp.navigation.index'));
+    }
 }
diff --git a/tests/Feature/Structures/EditStructureTest.php b/tests/Feature/Structures/EditStructureTest.php
deleted file mode 100644
index bf6323c9493..00000000000
--- a/tests/Feature/Structures/EditStructureTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Tests\Feature\Structures;
-
-use Mockery;
-use Statamic\Facades;
-use Tests\TestCase;
-use Tests\FakesRoles;
-use Statamic\Auth\User;
-use Statamic\Structures\Structure;
-use Tests\PreventSavingStacheItemsToDisk;
-
-class EditStructureTest extends TestCase
-{
-    use FakesRoles;
-    use PreventSavingStacheItemsToDisk;
-    use MocksStructures;
-
-    /** @test */
-    function it_shows_the_edit_form_if_user_has_edit_permission()
-    {
-        $structure = $this->createNavStructure('foo');
-        Facades\Structure::shouldReceive('all')->andReturn(collect([$structure]));
-        Facades\Structure::shouldReceive('find')->andReturn($structure);
-
-        $this->setTestRoles(['test' => ['access cp', 'edit foo structure']]);
-        $user = Facades\User::make()->assignRole('test')->save();
-
-        $response = $this
-            ->actingAs($user)
-            ->get(route('statamic.cp.structures.edit', $structure->handle()))
-            ->assertSuccessful()
-            ->assertViewHas('structure', $structure);
-    }
-
-    /** @test */
-    function it_denies_access_if_user_doesnt_have_edit_permission()
-    {
-        $structure = $this->createNavStructure('foo');
-        Facades\Structure::shouldReceive('all')->andReturn(collect([$structure]));
-        Facades\Structure::shouldReceive('find')->andReturn($structure);
-
-        $this->setTestRoles(['test' => ['access cp']]);
-        $user = tap(Facades\User::make()->assignRole('test'))->save();
-
-        $response = $this
-            ->from('/cp/original')
-            ->actingAs($user)
-            ->get(route('statamic.cp.structures.edit', $structure->handle()))
-            ->assertRedirect('/cp/original')
-            ->assertSessionHas('error');
-    }
-
-    /** @test */
-    function attempting_to_edit_a_collection_based_structure_should_404()
-    {
-        $structure = $this->createCollectionStructure('foo');
-        Facades\Structure::shouldReceive('all')->andReturn(collect([$structure]));
-        Facades\Structure::shouldReceive('find')->andReturn($structure);
-
-        $this->setTestRoles(['test' => ['access cp', 'edit foo structure']]);
-        $user = Facades\User::make()->assignRole('test')->save();
-
-        $response = $this
-            ->actingAs($user)
-            ->get(route('statamic.cp.structures.edit', $structure->handle()))
-            ->assertNotFound();
-    }
-}
diff --git a/tests/Feature/Structures/MocksStructures.php b/tests/Feature/Structures/MocksStructures.php
deleted file mode 100644
index 28576598022..00000000000
--- a/tests/Feature/Structures/MocksStructures.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Tests\Feature\Structures;
-
-use Mockery;
-use Statamic\Contracts\Structures\Structure;
-use Statamic\Structures\Tree;
-
-trait MocksStructures
-{
-    private function createStructure($handle)
-    {
-        return tap(Mockery::mock(Structure::class), function ($s) use ($handle) {
-            $s->shouldReceive('in')->andReturn($this->createStructureTree($handle));
-            $s->shouldReceive('title')->andReturn($handle);
-            $s->shouldReceive('handle')->andReturn($handle);
-            $s->shouldReceive('editUrl')->andReturn('/structure-edit-url');
-            $s->shouldReceive('deleteUrl')->andReturn('/structure-delete-url');
-        });
-    }
-
-    private function createNavStructure($structure)
-    {
-        return tap($this->createStructure($structure), function ($s) {
-            $s->shouldReceive('collection')->andReturnNull();
-            $s->shouldReceive('isCollectionBased')->andReturnFalse();
-            $s->shouldReceive('collections')->andReturn(collect());
-            $s->shouldReceive('expectsRoot')->andReturnTrue();
-        });
-    }
-
-    private function createCollectionStructure($structure)
-    {
-        return tap($this->createStructure($structure), function ($s) {
-            $s->shouldReceive('collection')->andReturn(true); // should return a collection instance but we're not using it in tests yet
-            $s->shouldReceive('isCollectionBased')->andReturnTrue();
-        });
-    }
-
-    private function createStructureTree($handle)
-    {
-        return tap(Mockery::mock(Tree::class), function ($s) use ($handle) {
-            $s->shouldReceive('editUrl')->andReturn('/tree-edit-url');
-            $s->shouldReceive('route')->andReturn('/route');
-        });
-    }
-}
diff --git a/tests/Stache/Repositories/NavigationRepositoryTest.php b/tests/Stache/Repositories/NavigationRepositoryTest.php
index 3cc02a02963..627f489a3e8 100644
--- a/tests/Stache/Repositories/NavigationRepositoryTest.php
+++ b/tests/Stache/Repositories/NavigationRepositoryTest.php
@@ -64,7 +64,7 @@ function it_gets_a_nav_by_handle()
     /** @test */
     function it_saves_a_nav_to_the_stache_and_to_a_file()
     {
-        $structure = (new \Statamic\Structures\Structure)->handle('new');
+        $structure = (new \Statamic\Structures\Nav)->handle('new');
         $structure->addTree($structure->makeTree('en'));
 
         $this->assertNull($this->repo->findByHandle('new'));
diff --git a/tests/Stache/Stores/NavigationStoreTest.php b/tests/Stache/Stores/NavigationStoreTest.php
index 47121aca018..75e43cc9ead 100644
--- a/tests/Stache/Stores/NavigationStoreTest.php
+++ b/tests/Stache/Stores/NavigationStoreTest.php
@@ -2,15 +2,16 @@
 
 namespace Tests\Stache\Stores;
 
+use Facades\Statamic\Stache\Traverser;
+use Illuminate\Filesystem\Filesystem;
 use Mockery;
+use Statamic\Contracts\Structures\Nav;
+use Statamic\Contracts\Structures\Structure;
 use Statamic\Facades;
-use Tests\TestCase;
+use Statamic\Facades\Path;
 use Statamic\Stache\Stache;
-use Illuminate\Filesystem\Filesystem;
-use Facades\Statamic\Stache\Traverser;
 use Statamic\Stache\Stores\NavigationStore;
-use Statamic\Contracts\Structures\Structure;
-use Statamic\Facades\Path;
+use Tests\TestCase;
 
 class NavigationStoreTest extends TestCase
 {
@@ -79,7 +80,7 @@ function it_makes_structure_instances_from_files()
 EOT;
         $item = $this->store->makeItemFromFile(Path::tidy($this->tempDir.'/pages.yaml'), $contents);
 
-        $this->assertInstanceOf(Structure::class, $item);
+        $this->assertInstanceOf(Nav::class, $item);
         $this->assertEquals('pages', $item->handle());
         $this->assertEquals('Pages', $item->title());
         // TODO: Some more assertions
@@ -90,14 +91,14 @@ function it_uses_the_filename_as_the_item_key()
     {
         $this->assertEquals(
             'test',
-            $this->store->getItemKey(Facades\Structure::make()->handle('test'))
+            $this->store->getItemKey(Facades\Nav::make()->handle('test'))
         );
     }
 
     /** @test */
     function it_saves_to_disk()
     {
-        $structure = Facades\Structure::make()->handle('pages');
+        $structure = Facades\Nav::make()->handle('pages');
         $structure->addTree($structure->makeTree('en'));
 
         $this->store->save($structure);

From 9e84a1ec7965ce387c3ebdeaea782de09dd4ce63 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 27 Feb 2020 11:25:51 -0500
Subject: [PATCH 033/137] Saving a collection structure saves it into the
 collection

---
 src/Entries/Collection.php                       | 16 +++++++++++++++-
 src/Structures/CollectionStructure.php           |  7 +++++++
 .../Data/Structures/CollectionStructureTest.php  | 12 ++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index c59c5c5eac8..8ab3c5991fc 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -399,6 +399,7 @@ public function fileData()
             'future_date_behavior',
             'default_publish_state',
             'dated',
+            'structured',
         ]);
 
         $array = Arr::removeNullValues(array_merge($array, [
@@ -428,6 +429,19 @@ public function fileData()
 
         $array['inject'] = Arr::pull($array, 'cascade');
 
+        if ($this->hasStructure()) {
+            $array['structure'] = Arr::removeNullValues([
+                'root' => $this->structure()->expectsRoot(),
+                'tree' => $this->structure()->trees()->map(function ($tree) {
+                    return $tree->fileData()['tree'];
+                })->all()
+            ]);
+
+            if (!Site::hasMultiple()) {
+                $array['structure']['tree'] = $array['structure']['tree'][Site::default()->handle()];
+            }
+        }
+
         return $array;
     }
 
@@ -470,7 +484,7 @@ public function toArray()
             'blueprints' => $this->blueprints,
             'search_index' => $this->searchIndex,
             'orderable' => $this->orderable,
-            'structure' => $this->structure,
+            'structured' => $this->hasStructure(),
             'mount' => $this->mount,
             'taxonomies' => $this->taxonomies,
             'revisions' => $this->revisions,
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
index 87747d81bac..4e6e7c83578 100644
--- a/src/Structures/CollectionStructure.php
+++ b/src/Structures/CollectionStructure.php
@@ -76,4 +76,11 @@ protected function getEntryIdsFromTree($tree)
             ->flatten()
             ->filter();
     }
+
+    public function save()
+    {
+        $this->collection()->structure($this)->save();
+
+        return true;
+    }
 }
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
index 76106eca296..2776541cd27 100644
--- a/tests/Data/Structures/CollectionStructureTest.php
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -130,4 +130,16 @@ function entries_may_only_appear_in_the_tree_once()
                 ]
             ]);
     }
+
+    /** @test */
+    function it_saves_through_the_collection()
+    {
+        $structure = $this->structure();
+        $collection = $this->mock(Collection::class);
+        $collection->shouldReceive('structure')->with($structure)->once()->ordered()->andReturnSelf();
+        $collection->shouldReceive('save')->once()->ordered()->andReturnTrue();
+        $structure->collection($collection);
+
+        $this->assertTrue($structure->save());
+    }
 }

From b3e639c9a053ab8adc06f97f6a2ecdadde00d732 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 27 Feb 2020 11:26:14 -0500
Subject: [PATCH 034/137] Structure pages can be saved

---
 .../CP/Structures/StructurePagesController.php      | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Http/Controllers/CP/Structures/StructurePagesController.php b/src/Http/Controllers/CP/Structures/StructurePagesController.php
index dfb29eb32f2..3eebb87eb19 100644
--- a/src/Http/Controllers/CP/Structures/StructurePagesController.php
+++ b/src/Http/Controllers/CP/Structures/StructurePagesController.php
@@ -29,17 +29,10 @@ public function store(Request $request, $structure)
     {
         $tree = $this->toTree($request->pages);
 
-        if ($request->expectsRoot) {
-            $root = array_pull($tree, 0)['entry'];
-            $tree = array_values($tree);
-        }
-
-        $tree = Structure::find($structure)
+        Structure::find($structure)
             ->in($request->site)
-            ->root($root ?? null)
-            ->tree($tree);
-
-        $tree->save();
+            ->tree($tree)
+            ->save();
     }
 
     protected function toTree($items)

From 6be12e9e74d7c38f66a96b2801845d7782ebc182 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 27 Feb 2020 12:06:54 -0500
Subject: [PATCH 035/137] Adjust permissions

---
 resources/lang/en/permissions.php | 10 +++++-----
 src/Auth/CorePermissions.php      | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/lang/en/permissions.php b/resources/lang/en/permissions.php
index 0a0aff54ced..48914ae3dfc 100644
--- a/resources/lang/en/permissions.php
+++ b/resources/lang/en/permissions.php
@@ -33,11 +33,11 @@
     'publish_{taxonomy}_terms' => 'Manage publish state',
     'reorder_{taxonomy}_terms' => 'Reorder terms',
 
-    'group_structures' => 'Structures',
-    'configure_structures' => 'Configure Structures',
-    'configure_structures_desc' => 'Grants access to all structure related permissions',
-    'view_{structure}_structure' => 'View :structure structure',
-    'edit_{structure}_structure' => 'Edit structure',
+    'group_navigation' => 'Navigation',
+    'configure_navs' => 'Configure Navigation',
+    'configure_navs_desc' => 'Grants access to all navigation related permissions',
+    'view_{nav}_nav' => 'View :nav navigation',
+    'edit_{nav}_nav' => 'Edit navigation',
 
     'group_globals' => 'Globals',
     'configure_globals' => 'Configure Globals',
diff --git a/src/Auth/CorePermissions.php b/src/Auth/CorePermissions.php
index e0ea1466c1a..3c5f304c16c 100644
--- a/src/Auth/CorePermissions.php
+++ b/src/Auth/CorePermissions.php
@@ -6,8 +6,8 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Form;
 use Statamic\Facades\GlobalSet;
+use Statamic\Facades\Nav;
 use Statamic\Facades\Permission;
-use Statamic\Facades\Structure;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\Utility;
 
@@ -24,8 +24,8 @@ public function boot()
             $this->registerCollections();
         });
 
-        $this->group('structures', function () {
-            $this->registerStructures();
+        $this->group('navigation', function () {
+            $this->registerNavigation();
         });
 
         $this->group('globals', function () {
@@ -77,16 +77,16 @@ protected function registerCollections()
         });
     }
 
-    protected function registerStructures()
+    protected function registerNavigation()
     {
-        $this->register('configure structures');
+        $this->register('configure navs');
 
-        $this->register('view {structure} structure', function ($permission) {
+        $this->register('view {nav} nav', function ($permission) {
             $this->permission($permission)->children([
-                $this->permission('edit {structure} structure')
-            ])->replacements('structure', function () {
-                return Structure::all()->map(function ($structure) {
-                    return ['value' => $structure->handle(), 'label' => $structure->title()];
+                $this->permission('edit {nav} nav')
+            ])->replacements('nav', function () {
+                return Nav::all()->map(function ($nav) {
+                    return ['value' => $nav->handle(), 'label' => $nav->title()];
                 });
             });
         });

From 876fef6db1218f9088b2a47d45ef3de879862fb5 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 27 Feb 2020 12:17:36 -0500
Subject: [PATCH 036/137] Hook up max depth

---
 src/Entries/Collection.php            | 3 ++-
 tests/Data/Entries/CollectionTest.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 8ab3c5991fc..1a281b22389 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -542,7 +542,8 @@ protected function makeStructureFromContents()
     {
         $structure = (new CollectionStructure)
             ->collection($this)
-            ->expectsRoot($this->structureContents['root'] ?? false);
+            ->expectsRoot($this->structureContents['root'] ?? false)
+            ->maxDepth($this->structureContents['max_depth'] ?? null);
 
         $trees = $this->structureContents['trees']
             ?? [Site::default()->handle() => $this->structureContents['tree']];
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index d7d268cec8a..5184ecc8f6c 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -357,5 +357,6 @@ function it_sets_the_structure_inline()
         $this->assertSame($collection, $structure->collection());
         $this->assertEquals(2, $structure->in('en')->pages()->all()->count());
         $this->assertEquals(3, $structure->in('en')->flattenedPages()->count());
+        $this->assertEquals(2, $structure->maxDepth());
     }
 }

From a024091c3fcec8f71a5aeffe04c313b80ad404a2 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 27 Feb 2020 12:21:01 -0500
Subject: [PATCH 037/137] Only show the tree view option when there's a
 structure and max depth is more than 1 ...

In preparation for ordering to be merged with the structure
---
 resources/js/components/collections/View.vue | 22 +++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 77557af2265..2a86b5af445 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -13,7 +13,7 @@
                     <slot name="twirldown" />
                 </dropdown-list>
 
-                <div class="btn-group-flat mr-2" v-if="structured">
+                <div class="btn-group-flat mr-2" v-if="canUseStructureTree">
                     <button @click="view = 'tree'" :class="{'active': view === 'tree'}">
                         <svg-icon name="structures" class="h-4 w-4"/>
                     </button>
@@ -68,10 +68,11 @@
         />
 
         <page-tree
-            v-if="structured"
+            v-if="canUseStructureTree"
             v-show="view === 'tree'"
             ref="tree"
             :has-collection="true"
+            :collections="[handle]"
             :pages-url="structurePagesUrl"
             :submit-url="structureSubmitUrl"
             :max-depth="structureMaxDepth"
@@ -102,12 +103,11 @@ export default {
         createUrl: { type: String, required: true },
         blueprints: { type: Array, required: true },
         breadcrumbUrl: { type: String, required: true },
-        structured: { type: Boolean, required: true },
+        structured: { type: Boolean, default: false },
         sortColumn: { type: String, required: true },
         sortDirection: { type: String, required: true },
         filters: { type: Array, required: true },
         actionUrl: { type: String, required: true },
-        reorderable: { type: Boolean, required: true },
         reorderUrl: { type: String, required: true },
         blueprints: { type: Array, required: true },
         site: { type: String, required: true },
@@ -128,7 +128,15 @@ export default {
 
         treeIsDirty() {
             return this.$dirty.has('page-tree');
-        }
+        },
+
+        canUseStructureTree() {
+            return this.structured && this.structureMaxDepth !== 1;
+        },
+
+        reorderable() {
+            return this.structured && this.structureMaxDepth === 1;
+        },
 
     },
 
@@ -176,9 +184,9 @@ export default {
         },
 
         initialView() {
-            if (!this.structured) return 'list';
+            if (!this.canUseStructureTree) return 'list';
 
-            const fallback = this.structured ? 'tree' : 'list';
+            const fallback = this.canUseStructureTree ? 'tree' : 'list';
 
             return localStorage.getItem('statamic.collection-view.'+this.handle) || fallback;
         }

From 1ae79b269145f09baf003c0ee10587ba61afcdf7 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 12:07:07 -0500
Subject: [PATCH 038/137] Entries can be reordered using the structure

---
 resources/js/components/collections/View.vue  |  1 +
 resources/js/components/entries/Listing.vue   | 12 +++-
 resources/views/collections/show.blade.php    |  3 +-
 .../Collections/ReorderEntriesController.php  | 34 ++++++---
 src/Structures/Tree.php                       |  2 +
 tests/Feature/Entries/ReorderEntriesTest.php  | 71 ++++++++++++++-----
 6 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 2a86b5af445..7a6ef645caf 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -65,6 +65,7 @@
             :action-url="actionUrl"
             :reorderable="reorderable"
             :reorder-url="reorderUrl"
+            :site="site"
         />
 
         <page-tree
diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index 531d71ea251..23881ada4e0 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -107,6 +107,7 @@ export default {
         reorderable: Boolean,
         reorderUrl: String,
         structureUrl: String,
+        site: String
     },
 
     data() {
@@ -174,9 +175,14 @@ export default {
         },
 
         saveOrder() {
-            let ids = this.items.map(item => item.id);
-
-            this.$axios.post(this.reorderUrl, {ids})
+            const payload = {
+                ids: this.items.map(item => item.id),
+                page: this.page,
+                perPage: this.perPage,
+                site: this.site
+            };
+
+            this.$axios.post(this.reorderUrl, payload)
                 .then(response => {
                     this.reordering = false;
                     this.$toast.success(__('Entries successfully reordered'))
diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index 23e36014dbd..f4ae16f80ce 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -4,7 +4,6 @@
 
 @section('content')
     <collection-view
-        :structured="{{ Statamic\Support\Str::bool($collection->hasStructure()) }}"
         title="{{ $collection->title() }}"
         handle="{{ $collection->handle() }}"
         breadcrumb-url="{{ cp_route('collections.index') }}"
@@ -15,11 +14,11 @@
         sort-direction="{{ $collection->sortDirection() }}"
         :filters="{{ $filters->toJson() }}"
         action-url="{{ cp_route('collections.entries.actions', $collection->handle()) }}"
-        :reorderable="{{ Statamic\Support\Str::bool($collection->orderable() && $user->can('reorder', $collection)) }}"
         reorder-url="{{ cp_route('collections.entries.reorder', $collection->handle()) }}"
         site="{{ $site }}"
 
         @if ($collection->hasStructure())
+        :structured="{{ Statamic\Support\Str::bool($user->can('reorder', $collection)) }}"
         structure-pages-url="{{ cp_route('structures.pages.index', $structure->handle()) }}"
         structure-submit-url="{{ cp_route('structures.pages.store', $structure->handle()) }}"
         :structure-max-depth="{{ $structure->maxDepth() ?? 'Infinity' }}"
diff --git a/src/Http/Controllers/CP/Collections/ReorderEntriesController.php b/src/Http/Controllers/CP/Collections/ReorderEntriesController.php
index e478dcd01c3..8a16ce2785a 100644
--- a/src/Http/Controllers/CP/Collections/ReorderEntriesController.php
+++ b/src/Http/Controllers/CP/Collections/ReorderEntriesController.php
@@ -12,16 +12,34 @@ public function __invoke(Request $request, $collection)
     {
         $this->authorize('reorder', $collection);
 
-        $request->validate(['ids' => 'required|array']);
+        $request->validate([
+            'ids' => 'required|array',
+            'page' => 'required|integer',
+            'perPage' => 'required|integer',
+            'site' => 'required',
+        ]);
 
-        $entries = collect($request->ids)->mapWithKeys(function ($id) {
-            return [$id => Entry::find($id)];
-        });
+        $tree = $collection->structure()->in($request->site);
 
-        $initialOrderPositions = $entries->map->order()->sort()->values();
+        $contents = collect($tree->tree())->keyBy('entry');
 
-        foreach ($request->ids as $index => $id) {
-            $entries[$id]->order($initialOrderPositions[$index])->save();
-        }
+        $reorderPayload = $request->ids;
+
+        $reorderedEntries = clone $contents;
+
+        $contents
+            ->keys()
+            ->forPage($request->page, $request->perPage)
+            ->zip($reorderPayload)
+            ->each(function ($operation) use ($contents, &$reorderedEntries) {
+                $reorderedEntries->put(
+                    $operation[0],
+                    $contents->get($operation[1])
+                );
+            });
+
+        $tree
+            ->tree($reorderedEntries->values()->all())
+            ->save();
     }
 }
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 4709d9d36ea..7795d69ef24 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -130,6 +130,8 @@ public function page(string $id): ?Page
 
     public function save()
     {
+        $this->cachedFlattenedPages = null;
+
         $this
             ->structure()
             ->addTree($this)
diff --git a/tests/Feature/Entries/ReorderEntriesTest.php b/tests/Feature/Entries/ReorderEntriesTest.php
index ec5587e41c1..41910f89715 100644
--- a/tests/Feature/Entries/ReorderEntriesTest.php
+++ b/tests/Feature/Entries/ReorderEntriesTest.php
@@ -9,6 +9,7 @@
 use Statamic\Facades\Collection;
 use Tests\PreventSavingStacheItemsToDisk;
 use Facades\Tests\Factories\EntryFactory;
+use Statamic\Structures\CollectionStructure;
 
 class ReorderEntriesTest extends TestCase
 {
@@ -19,9 +20,13 @@ public function setUp(): void
     {
         parent::setUp();
 
+        $this->structure = (new CollectionStructure)->maxDepth(1)->tap(function ($s) {
+            $s->addTree($s->makeTree('en'));
+        });
+
         $this->collection = Collection::make('test')
             ->sites(['en'])
-            ->orderable(true)
+            ->structure($this->structure)
             ->save();
     }
 
@@ -45,7 +50,7 @@ function it_denies_access_if_the_collection_is_not_orderable()
         $this->setTestRoles(['test' => ['access cp', 'reorder test entries']]);
         $user = tap(User::make()->assignRole('test'))->save();
 
-        $this->collection->orderable(false)->save();
+        Collection::make('test')->sites(['en'])->save();
 
         $this
             ->from('/original')
@@ -58,18 +63,29 @@ function it_denies_access_if_the_collection_is_not_orderable()
     /** @test */
     function it_reorders_entries()
     {
-        EntryFactory::id('1')->slug('one')->collection('test')->order(1)->create();
-        EntryFactory::id('2')->slug('two')->collection('test')->order(2)->create();
-        EntryFactory::id('3')->slug('three')->collection('test')->order(3)->create();
+        $this->structure->in('en')->tree([
+            ['entry' => '1'],
+            ['entry' => '2'],
+            ['entry' => '3'],
+        ])->save();
+
+        EntryFactory::id('1')->slug('one')->collection('test')->create();
+        EntryFactory::id('2')->slug('two')->collection('test')->create();
+        EntryFactory::id('3')->slug('three')->collection('test')->create();
 
         $this->setTestRoles(['test' => ['access cp', 'reorder test entries']]);
         $user = tap(User::make()->assignRole('test'))->save();
 
         $this
             ->actingAs($user)
-            ->reorder(['ids' => [3, 1, 2]])
+            ->reorder(['page' => 1, 'perPage' => 3, 'ids' => [3, 1, 2]])
             ->assertOk();
 
+        $this->assertEquals([
+            ['entry' => '3'],
+            ['entry' => '1'],
+            ['entry' => '2'],
+        ], $this->structure->in('en')->tree());
         $this->assertEquals(2, Entry::find(1)->order());
         $this->assertEquals(3, Entry::find(2)->order());
         $this->assertEquals(1, Entry::find(3)->order());
@@ -78,33 +94,54 @@ function it_reorders_entries()
     /** @test */
     function it_reorders_paginated_entries()
     {
-        EntryFactory::id('1')->slug('one')->collection('test')->order(1)->create();
-        EntryFactory::id('2')->slug('two')->collection('test')->order(2)->create();
+        $this->structure->in('en')->tree([
+            ['entry' => '1'],
+            ['entry' => '2'],
+            ['entry' => '3'],
+            ['entry' => '4'],
+            ['entry' => '5'],
+            ['entry' => '6'],
+            ['entry' => '7'],
+        ])->save();
+
+        EntryFactory::id('1')->slug('one')->collection('test')->create();
+        EntryFactory::id('2')->slug('two')->collection('test')->create();
+        EntryFactory::id('3')->slug('three')->collection('test')->create();
         // page starts here
-        EntryFactory::id('3')->slug('three')->collection('test')->order(3)->create();
-        EntryFactory::id('4')->slug('four')->collection('test')->order(4)->create();
-        EntryFactory::id('5')->slug('five')->collection('test')->order(5)->create();
+        EntryFactory::id('4')->slug('four')->collection('test')->create();
+        EntryFactory::id('5')->slug('five')->collection('test')->create();
+        EntryFactory::id('6')->slug('six')->collection('test')->create();
         // ends here
-        EntryFactory::id('6')->slug('six')->collection('test')->order(6)->create();
+        EntryFactory::id('7')->slug('seven')->collection('test')->create();
 
         $this->setTestRoles(['test' => ['access cp', 'reorder test entries']]);
         $user = tap(User::make()->assignRole('test'))->save();
 
         $this
             ->actingAs($user)
-            ->reorder(['ids' => [5, 3, 4]])
+            ->reorder(['page' => 2, 'perPage' => 3, 'ids' => [6, 4, 5]])
             ->assertOk();
 
+        $this->assertEquals([
+            ['entry' => '1'],
+            ['entry' => '2'],
+            ['entry' => '3'],
+            ['entry' => '6'],
+            ['entry' => '4'],
+            ['entry' => '5'],
+            ['entry' => '7'],
+        ], $this->structure->in('en')->tree());
         $this->assertEquals(1, Entry::find(1)->order());
         $this->assertEquals(2, Entry::find(2)->order());
-        $this->assertEquals(4, Entry::find(3)->order());
+        $this->assertEquals(3, Entry::find(3)->order());
+        $this->assertEquals(4, Entry::find(6)->order());
         $this->assertEquals(5, Entry::find(4)->order());
-        $this->assertEquals(3, Entry::find(5)->order());
-        $this->assertEquals(6, Entry::find(6)->order());
+        $this->assertEquals(6, Entry::find(5)->order());
+        $this->assertEquals(7, Entry::find(7)->order());
     }
 
     private function reorder($payload)
     {
-        return $this->post(cp_route('collections.entries.reorder', 'test'), $payload);
+        return $this->post(cp_route('collections.entries.reorder', 'test'), array_merge(['site' => 'en'], $payload));
     }
 }

From 06a78bad756cb410624cee8a5efa894a0634e73e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 13:18:55 -0500
Subject: [PATCH 039/137] The orderability of a collection comes from its
 structure ...

You can no longer mark a collection as "orderable".
Whether its orderable is defined by whether it has a structure with a max depth of 1.
---
 src/Entries/Collection.php                  | 90 +++------------------
 src/Entries/Entry.php                       | 13 +--
 src/Stache/Repositories/EntryRepository.php | 22 -----
 src/Stache/Stores/CollectionsStore.php      | 25 ------
 src/Tags/Collection/Entries.php             | 21 ++++-
 tests/Data/Entries/CollectionTest.php       | 56 +++++--------
 tests/Data/Entries/EntryTest.php            | 55 ++++---------
 tests/Factories/EntryFactory.php            | 10 ---
 tests/Stache/FeatureTest.php                |  3 +-
 tests/Tags/Collection/CollectionTest.php    | 62 +++++++-------
 tests/Tags/Collection/EntriesTest.php       | 36 ++++++++-
 11 files changed, 142 insertions(+), 251 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 1a281b22389..411704e45fc 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -32,7 +32,6 @@ class Collection implements Contract
     protected $blueprints = [];
     protected $searchIndex;
     protected $dated = false;
-    protected $orderable = false;
     protected $sortField;
     protected $sortDirection;
     protected $ampable = false;
@@ -71,9 +70,9 @@ public function dated($dated = null)
         return $this->fluentlyGetOrSet('dated')->args(func_get_args());
     }
 
-    public function orderable($orderable = null)
+    public function orderable()
     {
-        return $this->fluentlyGetOrSet('orderable')->args(func_get_args());
+        return optional($this->structure())->maxDepth() === 1;
     }
 
     public function sortField($field = null)
@@ -308,75 +307,6 @@ public function hasSearchIndex()
         return $this->searchIndex() !== null;
     }
 
-    public function getEntryPositions()
-    {
-        if ($this->positions) {
-            return $this->positions;
-        }
-
-        $this->positions = $this->queryEntries()->get()->mapWithKeys(function ($entry, $index) {
-            return [$index + 1 => $entry->id()];
-        });
-
-        return $this->positions;
-    }
-
-    public function setEntryPositions($positions)
-    {
-        $this->positions = collect($positions);
-
-        return $this;
-    }
-
-    public function setEntryPosition($id, $position)
-    {
-        $positions = $this->getEntryPositions()->all();
-
-        Arr::set($positions, $position, $id);
-
-        ksort($positions);
-
-        $this->setEntryPositions($positions);
-
-        return $this;
-    }
-
-    public function appendEntryPosition($id)
-    {
-        $position = $this->getEntryPositions()->keys()->sort()->last() + 1;
-
-        return $this->setEntryPosition($id, $position);
-    }
-
-    public function removeEntryPosition($id)
-    {
-        $positions = $this->getEntryPositions()->all();
-
-        unset($positions[$this->getEntryPosition($id)]);
-
-        $this->setEntryPositions($positions);
-
-        return $this;
-    }
-
-    public function getEntryPosition($id)
-    {
-        return $this->getEntryPositions()->flip()->get($id);
-    }
-
-    public function getEntryOrder($id = null)
-    {
-        $order = $this->getEntryPositions()->values();
-
-        if (func_num_args() === 0) {
-            return $order;
-        }
-
-        $index = $order->flip()->get($id);
-
-        return $index === null ? null : $index + 1;
-    }
-
     public function cascade($key = null, $default = null)
     {
         if (is_null($key)) {
@@ -400,12 +330,12 @@ public function fileData()
             'default_publish_state',
             'dated',
             'structured',
+            'orderable',
         ]);
 
         $array = Arr::removeNullValues(array_merge($array, [
             'amp' => $array['amp'] ?: null,
             'date' => $this->dated ?: null,
-            'orderable' => $array['orderable'] ?: null,
             'sort_by' => $this->sortField,
             'sort_dir' => $this->sortDirection,
             'default_status' => $this->defaultPublishState === false ? 'draft' : null,
@@ -415,10 +345,6 @@ public function fileData()
             ],
         ]));
 
-        if ($this->orderable()) {
-            $array['entry_order'] = $this->getEntryOrder()->all();
-        }
-
         if (! Site::hasMultiple()) {
             unset($array['sites']);
         }
@@ -432,6 +358,7 @@ public function fileData()
         if ($this->hasStructure()) {
             $array['structure'] = Arr::removeNullValues([
                 'root' => $this->structure()->expectsRoot(),
+                'max_depth' => $this->structure()->maxDepth(),
                 'tree' => $this->structure()->trees()->map(function ($tree) {
                     return $tree->fileData()['tree'];
                 })->all()
@@ -483,7 +410,7 @@ public function toArray()
             'cascade' => $this->cascade->all(),
             'blueprints' => $this->blueprints,
             'search_index' => $this->searchIndex,
-            'orderable' => $this->orderable,
+            'orderable' => $this->orderable(),
             'structured' => $this->hasStructure(),
             'mount' => $this->mount,
             'taxonomies' => $this->taxonomies,
@@ -526,7 +453,12 @@ public function structure($structure = null)
                 return $structure;
             })
             ->setter(function ($structure) {
-                return $structure->collection($this);
+                if ($structure) {
+                    $structure->collection($this);
+                } else {
+                    $this->structureContents = null;
+                }
+                return $structure;
             })
             ->args(func_get_args());
     }
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index ca08a793561..ae664f50669 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -244,15 +244,16 @@ public function path()
         ]);
     }
 
-    public function order($order = null)
+    public function order()
     {
-        if (func_num_args() === 0) {
-            return $this->collection()->getEntryOrder($this->id());
+        if (! $this->collection()->orderable()) {
+            return null;
         }
 
-        $this->collection()->setEntryPosition($this->id(), $order)->save();
-
-        return $this;
+        return $this->structure()->in($this->locale)
+            ->flattenedPages()
+            ->map->reference()
+            ->flip()->get($this->id) + 1;
     }
 
     public function template($template = null)
diff --git a/src/Stache/Repositories/EntryRepository.php b/src/Stache/Repositories/EntryRepository.php
index 4bfcd2912c1..f9f11243dbe 100644
--- a/src/Stache/Repositories/EntryRepository.php
+++ b/src/Stache/Repositories/EntryRepository.php
@@ -72,19 +72,11 @@ public function save($entry)
             $entry->id($this->stache->generateId());
         }
 
-        if ($entry->collection()->orderable()) {
-            $this->ensureEntryPosition($entry);
-        }
-
         $this->store->store($entry->collectionHandle())->save($entry);
     }
 
     public function delete($entry)
     {
-        if ($entry->collection()->orderable()) {
-            $this->removeEntryPosition($entry);
-        }
-
         $this->store->store($entry->collectionHandle())->delete($entry);
     }
 
@@ -107,20 +99,6 @@ public function taxonomize($entry)
         });
     }
 
-    protected function ensureEntryPosition($entry)
-    {
-        if (! $entry->collection()->getEntryPosition($entry->id())) {
-            $entry->collection()->appendEntryPosition($entry->id())->save();
-        }
-    }
-
-    protected function removeEntryPosition($entry)
-    {
-        if ($entry->collection()->getEntryPosition($entry->id())) {
-            $entry->collection()->removeEntryPosition($entry->id())->save();
-        }
-    }
-
     public function createRules($collection, $site)
     {
         return [
diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index db42e009bf1..df259149f17 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -51,7 +51,6 @@ public function makeItemFromFile($path, $contents)
             ->revisionsEnabled(array_get($data, 'revisions', false))
             ->defaultPublishState($this->getDefaultPublishState($data))
             ->structureContents(array_get($data, 'structure'))
-            ->orderable(array_get($data, 'orderable', false))
             ->sortField(array_get($data, 'sort_by'))
             ->sortDirection(array_get($data, 'sort_dir'))
             ->taxonomies(array_get($data, 'taxonomies'));
@@ -62,8 +61,6 @@ public function makeItemFromFile($path, $contents)
                 ->pastDateBehavior($dateBehavior['past'] ?? null);
         }
 
-        $collection = $this->setPositions($collection, $data);
-
         return $collection;
     }
 
@@ -78,28 +75,6 @@ protected function getDefaultPublishState($data)
         return $value === 'published';
     }
 
-    protected function setPositions($collection, $data)
-    {
-        if (! $collection->orderable()) {
-            return $collection;
-        }
-
-        // If it's not set, it'll work out the order automatically by querying entries when it needs to.
-        if (! array_has($data, 'entry_order')) {
-            return $collection;
-        }
-
-        $order = array_get($data, 'entry_order');
-
-        // The entries are in the YAML as a simple zero-indexed array. The positions on the
-        // collection object expect the keys to be the actual positions (ie. starts with 1)
-        $positions = collect($order)->mapWithKeys(function ($entry, $index) {
-            return [$index + 1 => $entry];
-        });
-
-        return $collection->setEntryPositions($positions);
-    }
-
     public function updateEntryUris($collection)
     {
         Stache::store('entries')
diff --git a/src/Tags/Collection/Entries.php b/src/Tags/Collection/Entries.php
index a71da9ecccd..2e72d66b58a 100644
--- a/src/Tags/Collection/Entries.php
+++ b/src/Tags/Collection/Entries.php
@@ -17,9 +17,12 @@ class Entries
 {
     use Query\HasConditions,
         Query\HasScopes,
-        Query\HasOrderBys,
         Query\GetsResults;
 
+    use Query\HasOrderBys {
+        queryOrderBys as traitQueryOrderBys;
+    }
+
     protected $ignoredParams = ['as'];
     protected $parameters;
     protected $collections;
@@ -312,4 +315,20 @@ protected function queryTaxonomies($query)
             }
         });
     }
+
+    protected function queryOrderBys($query)
+    {
+        $isSortingByOrder = null !== $this->orderBys->first(function ($orderBy) {
+            return $orderBy->sort === 'order';
+        });
+
+        if ($isSortingByOrder) {
+            $nonOrderableCollections = $this->collections->reject->orderable();
+            if ($nonOrderableCollections->isNotEmpty()) {
+                throw new \LogicException('Cannot sort a nested collection by order.');
+            }
+        }
+
+        return $this->traitQueryOrderBys($query);
+    }
 }
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index 5184ecc8f6c..aa2c678a687 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -184,14 +184,23 @@ function it_gets_sort_field_and_direction()
         $this->assertEquals('date', $dated->sortField());
         $this->assertEquals('desc', $dated->sortDirection());
 
-        $ordered = (new Collection)->orderable(true);
+        $structureWithMaxDepthOfOne = $this->makeStructure()->maxDepth(1);
+        $ordered = (new Collection)->structure($structureWithMaxDepthOfOne);
         $this->assertEquals('order', $ordered->sortField());
         $this->assertEquals('asc', $ordered->sortDirection());
 
-        $datedAndOrdered = (new Collection)->dated(true)->orderable(true);
+        $datedAndOrdered = (new Collection)->dated(true)->structure($structureWithMaxDepthOfOne);
         $this->assertEquals('order', $datedAndOrdered->sortField());
         $this->assertEquals('asc', $datedAndOrdered->sortDirection());
 
+        $structure = $this->makeStructure();
+        $alpha->structure($structure);
+        $this->assertEquals('title', $alpha->sortField());
+        $this->assertEquals('asc', $alpha->sortDirection());
+        $dated->structure($structure);
+        $this->assertEquals('date', $dated->sortField());
+        $this->assertEquals('desc', $dated->sortDirection());
+
         // TODO: Ability to control sort direction
     }
 
@@ -209,42 +218,6 @@ function it_saves_the_collection_through_the_api()
         $this->assertEquals($collection, $return);
     }
 
-    /** @test */
-    function entry_can_be_ordered()
-    {
-        $collection = (new Collection)->handle('test')->setEntryPositions([]);
-
-        $return = $collection->setEntryPosition('one', 3);
-        $this->assertEquals($collection, $return);
-        $this->assertSame([3 => 'one'], $collection->getEntryPositions()->all());
-        $this->assertSame(['one'], $collection->getEntryOrder()->all());
-        $this->assertEquals(1, $collection->getEntryOrder('one'));
-
-        $collection->setEntryPosition('two', 7);
-        $this->assertSame([3 => 'one', 7 => 'two'], $collection->getEntryPositions()->all());
-        $this->assertSame(['one', 'two'], $collection->getEntryOrder()->all());
-        $this->assertEquals(1, $collection->getEntryOrder('one'));
-        $this->assertEquals(2, $collection->getEntryOrder('two'));
-
-        $collection->setEntryPosition('three', 5);
-        $this->assertSame([3 => 'one', 5 => 'three', 7 => 'two'], $collection->getEntryPositions()->all());
-        $this->assertSame(['one', 'three', 'two'], $collection->getEntryOrder()->all());
-        $this->assertEquals(1, $collection->getEntryOrder('one'));
-        $this->assertEquals(3, $collection->getEntryOrder('two'));
-        $this->assertEquals(2, $collection->getEntryOrder('three'));
-
-        $collection->setEntryPosition('four', 1);
-        $this->assertSame([1 => 'four', 3 => 'one', 5 => 'three', 7 => 'two'], $collection->getEntryPositions()->all());
-        $this->assertSame(['four', 'one', 'three', 'two'], $collection->getEntryOrder()->all());
-        $this->assertEquals(2, $collection->getEntryOrder('one'));
-        $this->assertEquals(4, $collection->getEntryOrder('two'));
-        $this->assertEquals(3, $collection->getEntryOrder('three'));
-        $this->assertEquals(1, $collection->getEntryOrder('four'));
-
-        $this->assertNull($collection->getEntryPosition('unknown'));
-        $this->assertNull($collection->getEntryOrder('unknown'));
-    }
-
     /** @test */
     function it_sets_future_date_behavior()
     {
@@ -359,4 +332,11 @@ function it_sets_the_structure_inline()
         $this->assertEquals(3, $structure->in('en')->flattenedPages()->count());
         $this->assertEquals(2, $structure->maxDepth());
     }
+
+    private function makeStructure()
+    {
+        return (new CollectionStructure)->tap(function ($s) {
+            $s->addTree($s->makeTree('en'));
+        });
+    }
 }
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index da557116aaf..9f0cddf5ced 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -373,43 +373,20 @@ function it_gets_and_sets_the_date()
     }
 
     /** @test */
-    function it_gets_and_sets_the_order()
-    {
-        $collection = tap(Collection::make('ordered'))->save();
-        $one = (new Entry)->id('one')->collection($collection);
-        $this->assertNull($one->order());
-
-        $return = $one->order(5);
-        $this->assertEquals($one, $return);
-        $this->assertEquals(1, $one->order());
-
-        $two = (new Entry)->id('two')->collection($collection);
-        $two->order(10);
-        $this->assertEquals(1, $one->order());
-        $this->assertEquals(2, $two->order());
-
-        $three = (new Entry)->id('three')->collection($collection);
-        $three->order(2);
-        $this->assertEquals(2, $one->order());
-        $this->assertEquals(3, $two->order());
-        $this->assertEquals(1, $three->order());
-    }
-
-    /** @test */
-    function it_sets_the_order_on_the_collection_when_dealing_with_numeric_collections()
-    {
-        $collection = tap(Collection::make('ordered')->orderable(true))->save();
-        $one = (new Entry)->id('one')->collection($collection);
-        $two = (new Entry)->id('two')->collection($collection);
-
-        $one->order('3');
-        $two->order('2');
-
-        $this->assertEquals([2 => 'two', 3 => 'one'], $collection->getEntryPositions()->all());
-        $this->assertEquals(['two', 'one'], $collection->getEntryOrder()->all());
+    function it_gets_the_order_from_the_collections_structure()
+    {
+        $collection = tap(Collection::make('ordered')->structureContents([
+            'max_depth' => 1,
+            'tree' => [
+                ['entry' => 'three'],
+                ['entry' => 'one'],
+                ['entry' => 'two'],
+            ]
+        ]))->save();
 
-        $this->assertEquals(2, $one->order());
-        $this->assertEquals(1, $two->order());
+        $this->assertEquals(2, (new Entry)->locale('en')->id('one')->collection($collection)->order());
+        $this->assertEquals(3, (new Entry)->locale('en')->id('two')->collection($collection)->order());
+        $this->assertEquals(1, (new Entry)->locale('en')->id('three')->collection($collection)->order());
     }
 
     /** @test */
@@ -421,15 +398,13 @@ function it_gets_and_sets_the_date_for_date_collections()
             $collection = tap(Collection::make('dated')->dated(true))->save();
             return (new Entry)->collection($collection);
         });
+
         $numberEntry = with('', function() {
-            $collection = tap(Collection::make('ordered')->orderable(true))->save();
+            $collection = tap(Collection::make('ordered')->structureContents(['max_depth' => 1, 'tree' => []]))->save();
             return (new Entry)->collection($collection);
         });
-        $this->assertNull($dateEntry->order());
-        $this->assertNull($numberEntry->order());
 
         $dateEntry->date('2017-01-02');
-        $numberEntry->order('2017-01-02');
 
         $this->assertEquals('2017-01-02 12:00am', $dateEntry->date()->format('Y-m-d h:ia'));
         $this->assertTrue($dateEntry->hasDate());
diff --git a/tests/Factories/EntryFactory.php b/tests/Factories/EntryFactory.php
index 1696aa3f7f2..28bdd293751 100644
--- a/tests/Factories/EntryFactory.php
+++ b/tests/Factories/EntryFactory.php
@@ -45,12 +45,6 @@ public function published($published)
         return $this;
     }
 
-    public function order($order)
-    {
-        $this->order = $order;
-        return $this;
-    }
-
     public function locale($locale)
     {
         $this->locale = $locale;
@@ -71,10 +65,6 @@ public function make()
             $entry->id($this->id);
         }
 
-        if ($this->order) {
-            $entry->order($this->order);
-        }
-
         return $entry;
     }
 
diff --git a/tests/Stache/FeatureTest.php b/tests/Stache/FeatureTest.php
index 95def2c76cd..2b8871a004e 100644
--- a/tests/Stache/FeatureTest.php
+++ b/tests/Stache/FeatureTest.php
@@ -206,7 +206,6 @@ function saving_a_collection_writes_it_to_file()
         Collection::make('new')
             ->title('New Collection')
             ->defaultPublishState(false)
-            ->orderable(true)
             ->dated(true)
             ->revisionsEnabled(true)
             ->cascade(['foo' => 'bar'])
@@ -214,7 +213,7 @@ function saving_a_collection_writes_it_to_file()
 
         $this->assertStringEqualsFile(
             $path = __DIR__.'/__fixtures__/content/collections/new.yaml',
-            "title: 'New Collection'\norderable: true\nrevisions: true\ndate: true\ndefault_status: draft\ninject:\n  foo: bar\n"
+            "title: 'New Collection'\nrevisions: true\ndate: true\ndefault_status: draft\ninject:\n  foo: bar\n"
         );
         @unlink($path);
     }
diff --git a/tests/Tags/Collection/CollectionTest.php b/tests/Tags/Collection/CollectionTest.php
index ba4bf1b1943..80470c51ad3 100644
--- a/tests/Tags/Collection/CollectionTest.php
+++ b/tests/Tags/Collection/CollectionTest.php
@@ -14,6 +14,7 @@
 use Tests\PreventSavingStacheItemsToDisk;
 use Statamic\Exceptions\CollectionNotFoundException;
 use Statamic\Facades\Blueprint;
+use Statamic\Structures\CollectionStructure;
 
 class CollectionTest extends TestCase
 {
@@ -35,7 +36,7 @@ function setUp(): void
 
     protected function makeEntry($collection, $slug)
     {
-        return EntryFactory::collection($collection)->slug($slug)->make();
+        return EntryFactory::id($slug)->collection($collection)->slug($slug)->make();
     }
 
     protected function makePosts()
@@ -321,7 +322,19 @@ function it_can_get_previous_and_next_entries_in_a_dated_asc_collection()
     /** @test */
     function it_can_get_previous_and_next_entries_in_an_orderable_asc_collection()
     {
-        $this->foods->orderable(true)->save();
+        $structure = $this->makeStructure([
+            ['entry' => 'c'], // Carrot
+            ['entry' => 'h'], // Hummus
+            ['entry' => 'a'], // Apple
+            ['entry' => 'i'], // Ice Cream
+            ['entry' => 'b'], // Banana
+            ['entry' => 'f'], // Fig
+            ['entry' => 'g'], // Grape
+            ['entry' => 'e'], // Egg
+            ['entry' => 'd'], // Danish
+        ])->maxDepth(1);
+
+        $this->foods->structure($structure)->save();
 
         $this->makeEntry($this->foods, 'a')->set('title', 'Apple')->save();
         $this->makeEntry($this->foods, 'b')->set('title', 'Banana')->save();
@@ -333,18 +346,6 @@ function it_can_get_previous_and_next_entries_in_an_orderable_asc_collection()
         $this->makeEntry($this->foods, 'h')->set('title', 'Hummus')->save();
         $this->makeEntry($this->foods, 'i')->set('title', 'Ice Cream')->save();
 
-        $this->foods->setEntryPositions([
-            $this->findEntryByTitle('Carrot')->id(),
-            $this->findEntryByTitle('Hummus')->id(),
-            $this->findEntryByTitle('Apple')->id(),
-            $this->findEntryByTitle('Ice Cream')->id(),
-            $this->findEntryByTitle('Banana')->id(),
-            $this->findEntryByTitle('Fig')->id(),
-            $this->findEntryByTitle('Grape')->id(),
-            $this->findEntryByTitle('Egg')->id(),
-            $this->findEntryByTitle('Danish')->id(),
-        ])->save();
-
         $currentId = $this->findEntryByTitle('Banana')->id();
 
         $orderBy = 'order:asc';
@@ -370,7 +371,19 @@ function it_can_get_previous_and_next_entries_in_an_orderable_asc_collection()
     /** @test */
     function it_can_get_previous_and_next_entries_in_an_orderable_desc_collection()
     {
-        $this->foods->orderable(true)->save();
+        $structure = $this->makeStructure([
+            ['entry' => 'c'], // Carrot
+            ['entry' => 'h'], // Hummus
+            ['entry' => 'a'], // Apple
+            ['entry' => 'i'], // Ice Cream
+            ['entry' => 'b'], // Banana
+            ['entry' => 'f'], // Fig
+            ['entry' => 'g'], // Grape
+            ['entry' => 'e'], // Egg
+            ['entry' => 'd'], // Danish
+        ])->maxDepth(1);
+
+        $this->foods->structure($structure)->save();
 
         $this->makeEntry($this->foods, 'a')->set('title', 'Apple')->save();
         $this->makeEntry($this->foods, 'b')->set('title', 'Banana')->save();
@@ -382,18 +395,6 @@ function it_can_get_previous_and_next_entries_in_an_orderable_desc_collection()
         $this->makeEntry($this->foods, 'h')->set('title', 'Hummus')->save();
         $this->makeEntry($this->foods, 'i')->set('title', 'Ice Cream')->save();
 
-        $this->foods->setEntryPositions([
-            $this->findEntryByTitle('Carrot')->id(),
-            $this->findEntryByTitle('Hummus')->id(),
-            $this->findEntryByTitle('Apple')->id(),
-            $this->findEntryByTitle('Ice Cream')->id(),
-            $this->findEntryByTitle('Banana')->id(),
-            $this->findEntryByTitle('Fig')->id(),
-            $this->findEntryByTitle('Grape')->id(),
-            $this->findEntryByTitle('Egg')->id(),
-            $this->findEntryByTitle('Danish')->id(),
-        ])->save();
-
         $currentId = $this->findEntryByTitle('Banana')->id();
 
         $orderBy = 'order:desc';
@@ -458,4 +459,11 @@ protected function runTagAndGetTitles($tagMethod)
     {
         return $this->collectionTag->{$tagMethod}()->map->get('title')->values()->all();
     }
+
+    protected function makeStructure($tree = [])
+    {
+        return (new CollectionStructure)->tap(function ($s) use ($tree) {
+            $s->addTree($s->makeTree('en')->tree($tree));
+        });
+    }
 }
diff --git a/tests/Tags/Collection/EntriesTest.php b/tests/Tags/Collection/EntriesTest.php
index 928d571542f..88165cdeffd 100644
--- a/tests/Tags/Collection/EntriesTest.php
+++ b/tests/Tags/Collection/EntriesTest.php
@@ -10,6 +10,7 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\Taxonomy;
 use Statamic\Query\Scopes\Scope;
+use Statamic\Structures\CollectionStructure;
 use Statamic\Tags\Collection\Entries;
 use Statamic\Tags\Context;
 use Statamic\Tags\Parameters;
@@ -47,7 +48,7 @@ protected function getEnvironmentSetUp($app)
 
     protected function makeEntry($slug)
     {
-        return EntryFactory::slug($slug)->collection($this->collection)->make();
+        return EntryFactory::id($slug)->slug($slug)->collection($this->collection)->make();
     }
 
     protected function getEntries($params = [])
@@ -308,6 +309,39 @@ function it_sorts_entries_randomly()
         $this->assertTrue($orders->unique()->count() > 1);
     }
 
+    /** @test */
+    function it_cannot_sort_a_nested_structured_collection()
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('Cannot sort a nested collection by order.');
+
+        $structure = (new CollectionStructure)->maxDepth(2);
+        $this->collection->structure($structure)->save();
+
+        $this->getEntries(['sort' => 'order|title']);
+    }
+
+    /** @test */
+    function it_can_sort_a_linear_structured_collection()
+    {
+        $this->makeEntry('a')->save();
+        $this->makeEntry('b')->save();
+        $this->makeEntry('c')->save();
+
+        $structure = (new CollectionStructure)->maxDepth(1)->tap(function ($s) {
+            $s->addTree($s->makeTree('en')->tree([
+                ['entry' => 'b'],
+                ['entry' => 'c'],
+                ['entry' => 'a'],
+            ]));
+        });
+
+        $this->collection->structure($structure)->save();
+
+        $this->assertEquals(['a', 'b', 'c'], $this->getEntries(['sort' => 'id'])->map->id()->all());
+        $this->assertEquals(['b', 'c', 'a'], $this->getEntries(['sort' => 'order|title'])->map->id()->all());
+    }
+
     /** @test */
     function it_filters_by_a_single_taxonomy_term()
     {

From b554c17c1a743decd45620d92f22dcf61a712483 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 13:20:43 -0500
Subject: [PATCH 040/137] Adjust collection crud ...

Now uses the "orderable"/"structured" updates.
Toggling on "orderable" will create a structure in the collection.
---
 .../CP/Collections/CollectionsController.php  | 141 ++++++++++--------
 1 file changed, 82 insertions(+), 59 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 7abd8975fd3..0259830869f 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -2,18 +2,19 @@
 
 namespace Statamic\Http\Controllers\CP\Collections;
 
-use Statamic\Support\Str;
-use Statamic\Facades\Site;
-use Statamic\Facades\User;
-use Statamic\Facades\Scope;
+use Illuminate\Http\Request;
+use Statamic\Contracts\Entries\Collection as CollectionContract;
 use Statamic\CP\Column;
 use Statamic\Facades\Action;
 use Statamic\Facades\Blueprint;
-use Statamic\Facades\Structure;
-use Illuminate\Http\Request;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Scope;
+use Statamic\Facades\Site;
+use Statamic\Facades\Structure;
+use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
-use Statamic\Contracts\Entries\Collection as CollectionContract;
+use Statamic\Structures\CollectionStructure;
+use Statamic\Support\Str;
 
 class CollectionsController extends CpController
 {
@@ -117,7 +118,24 @@ public function edit($collection)
     {
         $this->authorize('edit', $collection, 'You are not authorized to edit this collection.');
 
-        $values = $collection->toArray();
+        $values = [
+            'title' => $collection->title(),
+            'handle' => $collection->handle(),
+            'dated' => $collection->dated(),
+            'past_date_behavior' => $collection->pastDateBehavior(),
+            'future_date_behavior' => $collection->futureDateBehavior(),
+            'structured' => $collection->hasStructure(),
+            'sort_direction' => $collection->sortDirection(),
+            'max_depth' => optional($collection->structure())->maxDepth(),
+            'expects_root' => optional($collection->structure())->expectsRoot(),
+            'blueprints' => $collection->entryBlueprints()->map->handle()->all(),
+            'taxonomies' => $collection->taxonomies()->map->handle()->all(),
+            'default_publish_state' => $collection->defaultPublishState(),
+            'template' => $collection->template(),
+            'layout' => $collection->layout(),
+            'route' => $collection->route(),
+            'amp' => $collection->ampable(),
+        ];
 
         $fields = ($blueprint = $this->editFormBlueprint())
             ->fields()
@@ -170,7 +188,20 @@ public function update(Request $request, $collection)
 
         $fields->validate();
 
-        $collection = $this->updateCollection($collection, $values = $fields->process()->values()->all());
+        $values = $fields->process()->values()->all();
+
+        $collection
+            ->title($values['title'])
+            ->route($values['route'])
+            ->dated($values['dated'])
+            ->template($values['template'])
+            ->layout($values['layout'])
+            ->defaultPublishState($values['default_publish_state'])
+            ->sortDirection($values['sort_direction'])
+            ->ampable($values['amp'])
+            ->entryBlueprints($values['blueprints'])
+            ->mount($values['mount'] ?? null)
+            ->taxonomies($values['taxonomies'] ?? []);
 
         if ($futureDateBehavior = array_get($values, 'future_date_behavior')) {
             $collection->futureDateBehavior($futureDateBehavior);
@@ -180,54 +211,45 @@ public function update(Request $request, $collection)
             $collection->pastDateBehavior($pastDateBehavior);
         }
 
+        if (! $values['structured']) {
+            $collection->structure(null);
+        } else {
+            $collection->structure($this->makeStructure($collection, $values['max_depth'], $values['expects_root']));
+        }
+
         $collection->save();
 
         return $collection->toArray();
     }
 
-    public function destroy($collection)
+    protected function makeStructure($collection, $maxDepth, $expectsRoot)
     {
-        $this->authorize('delete', $collection, 'You are not authorized to delete this collection.');
+        if (! $structure = $collection->structure()) {
+            $structure = new CollectionStructure;
+
+            // todo: make multiple trees based on the existing multisite nature of the collection
+            $trees = [
+                Site::default()->handle() => $collection->queryEntries()->get('id')->map(function ($entry) {
+                    return ['entry' => $entry->id()];
+                })->all()
+            ];
 
-        $collection->delete();
-    }
+            foreach ($trees as $site => $contents) {
+                $tree = $structure->makeTree($site)->tree($contents);
+                $structure->addTree($tree);
+            }
+        }
 
-    protected function updateCollection($collection, $data)
-    {
-        return $collection
-            ->title($data['title'])
-            ->route($data['route'])
-            ->dated($data['dated'])
-            ->template($data['template'])
-            ->layout($data['layout'])
-            ->structure($structure = array_get($data, 'structure'))
-            ->orderable($structure ? false : $data['orderable'])
-            ->defaultPublishState($data['default_publish_state'])
-            ->sortDirection($data['sort_direction'])
-            ->ampable($data['amp'])
-            ->entryBlueprints($data['blueprints'])
-            ->mount($data['mount'] ?? null)
-            ->taxonomies($data['taxonomies'] ?? []);
+        return $structure
+            ->maxDepth($maxDepth)
+            ->expectsRoot($expectsRoot);
     }
 
-    protected function ensureStructureExists($structure)
+    public function destroy($collection)
     {
-        if (! $structure) {
-            return;
-        }
-
-        if (Structure::findByHandle($structure)) {
-            return;
-        }
-
-        Structure::make()
-            ->handle($handle = Str::snake($structure))
-            ->title($structure)
-            ->tap(function ($structure) {
-                $structure->addTree($structure->makeTree(Site::default()->handle()));
-            })->save();
+        $this->authorize('delete', $collection, 'You are not authorized to delete this collection.');
 
-        return $handle;
+        $collection->delete();
     }
 
     protected function editFormBlueprint()
@@ -240,13 +262,7 @@ protected function editFormBlueprint()
                         'type' => 'text',
                         'instructions' => __('statamic::messages.collection_configure_title_instructions'),
                         'validate' => 'required',
-                    ],
-                    'handle' => [
-                        'type' => 'text',
-                        'display' => __('Collection Handle'),
-                        'instructions' => __('statamic::messages.collection_configure_handle_instructions'),
-                        'validate' => 'required|alpha_dash',
-                    ],
+                    ]
                 ]
             ],
             'dates' => [
@@ -281,10 +297,10 @@ protected function editFormBlueprint()
             ],
             'ordering' => [
                 'fields' => [
-                    'orderable' => [
+                    'structured' => [
+                        'display' => __('Orderable'),
                         'type' => 'toggle',
                         'instructions' => __('statamic::messages.collections_orderable_instructions'),
-                        'if' => ['structure' => 'empty']
                     ],
                     'sort_direction' => [
                         'type' => 'select',
@@ -293,12 +309,19 @@ protected function editFormBlueprint()
                             'asc' => 'Ascending',
                             'desc' => 'Descending'
                         ],
-                        'if' => ['structure' => 'empty']
                     ],
-                    'structure' => [
-                        'type' => 'structures',
-                        'max_items' => 1,
-                        'instructions' => __('statamic::messages.collections_structure_instructions'),
+                    'max_depth' => [
+                        'type' => 'integer',
+                        'display' => 'Max depth',
+                        'instructions' => 'The maximum number of levels deep a page may be nested. Leave blank for no limit.',
+                        'validate' => 'min:0',
+                        'if' => ['structured' => true],
+                    ],
+                    'expects_root' => [
+                        'type' => 'toggle',
+                        'display' => 'Expect a root page',
+                        'instructions' => 'The first page in the tree should be considered the "root" or "home" page.',
+                        'if' => ['structured' => true],
                     ],
                 ],
             ],

From e164d0fba86268fb30280b87010e9705ac49884c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 15:02:34 -0500
Subject: [PATCH 041/137] Collection structures will automatically add entries
 not in the tree. They will also make sure only entries from that collection
 are in there.

---
 .../CP/Collections/CollectionsController.php  |   2 +-
 src/Structures/CollectionStructure.php        |  16 ++-
 src/Structures/Structure.php                  |   6 +-
 src/Structures/Tree.php                       |   3 +-
 tests/Data/Entries/EntryTest.php              |  20 +++-
 .../Structures/CollectionStructureTest.php    | 105 ++++++++++++++++--
 tests/Data/Structures/StructureTestCase.php   |  14 ++-
 tests/Data/Structures/TreeTest.php            |   2 +-
 tests/Feature/Entries/ReorderEntriesTest.php  |  28 ++---
 tests/Tags/Collection/CollectionTest.php      |  56 +++++-----
 tests/Tags/Collection/EntriesTest.php         |   2 +-
 11 files changed, 186 insertions(+), 68 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 0259830869f..f886f96d83e 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -225,7 +225,7 @@ public function update(Request $request, $collection)
     protected function makeStructure($collection, $maxDepth, $expectsRoot)
     {
         if (! $structure = $collection->structure()) {
-            $structure = new CollectionStructure;
+            $structure = (new CollectionStructure)->collection($collection);
 
             // todo: make multiple trees based on the existing multisite nature of the collection
             $trees = [
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
index 4e6e7c83578..16b2a406431 100644
--- a/src/Structures/CollectionStructure.php
+++ b/src/Structures/CollectionStructure.php
@@ -53,7 +53,7 @@ public function route(string $site): ?string
             : $route;
     }
 
-    public function validateTree(array $tree): void
+    public function validateTree(array $tree): array
     {
         parent::validateTree($tree);
 
@@ -62,6 +62,20 @@ public function validateTree(array $tree): void
         if ($entryId = $entryIds->duplicates()->first()) {
             throw new \Exception("Duplicate entry [{$entryId}] in [{$this->collection->handle()}] collection's structure.");
         }
+
+        $thisCollectionsEntries = $this->collection->queryEntries()->get('id')->map->id();
+
+        $otherCollectionEntries = $entryIds->diff($thisCollectionsEntries);
+
+        if ($otherCollectionEntries->isNotEmpty()) {
+            throw new \Exception("Only entries from the [{$this->collection->handle()}] collection may be in its structure. Encountered ID of [{$otherCollectionEntries->first()}]");
+        }
+
+        $missingEntries = $thisCollectionsEntries->diff($entryIds)->map(function ($id) {
+            return ['entry' => $id];
+        })->values()->all();
+
+        return array_merge($tree, $missingEntries);
     }
 
     protected function getEntryIdsFromTree($tree)
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index fd5b1276a53..5f7788b1db8 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -114,10 +114,10 @@ public function maxDepth($maxDepth = null)
             })->args(func_get_args());
     }
 
-    public function validateTree(array $tree): void
+    public function validateTree(array $tree): array
     {
         if (! $this->expectsRoot()) {
-            return;
+            return $tree;
         }
 
         if (!empty($tree) && !isset($tree[0]['entry'])) {
@@ -125,6 +125,8 @@ public function validateTree(array $tree): void
         }
 
         throw_if(isset($tree[0]['children']), new \Exception('Root page cannot have children'));
+
+        return $tree;
     }
 
     public function route(string $site): ?string
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 7795d69ef24..067840b99fb 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -32,8 +32,7 @@ public function tree($tree = null)
     {
         return $this->fluentlyGetOrSet('tree')
             ->setter(function ($tree) {
-                $this->structure->validateTree($tree);
-                return $tree;
+                return $this->structure->validateTree($tree);
             })
             ->args(func_get_args());
     }
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 9f0cddf5ced..a7319b20471 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -375,18 +375,28 @@ function it_gets_and_sets_the_date()
     /** @test */
     function it_gets_the_order_from_the_collections_structure()
     {
-        $collection = tap(Collection::make('ordered')->structureContents([
+        $collection = tap(Collection::make('ordered'))->save();
+
+        $one = tap((new Entry)->locale('en')->id('one')->collection($collection))->save();
+        $two = tap((new Entry)->locale('en')->id('two')->collection($collection))->save();
+        $three = tap((new Entry)->locale('en')->id('three')->collection($collection))->save();
+
+        $this->assertNull($one->order());
+        $this->assertNull($one->order());
+        $this->assertNull($one->order());
+
+        $collection->structureContents([
             'max_depth' => 1,
             'tree' => [
                 ['entry' => 'three'],
                 ['entry' => 'one'],
                 ['entry' => 'two'],
             ]
-        ]))->save();
+        ])->save();
 
-        $this->assertEquals(2, (new Entry)->locale('en')->id('one')->collection($collection)->order());
-        $this->assertEquals(3, (new Entry)->locale('en')->id('two')->collection($collection)->order());
-        $this->assertEquals(1, (new Entry)->locale('en')->id('three')->collection($collection)->order());
+        $this->assertEquals(2, $one->order());
+        $this->assertEquals(3, $two->order());
+        $this->assertEquals(1, $three->order());
     }
 
     /** @test */
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
index 2776541cd27..f19d72039e1 100644
--- a/tests/Data/Structures/CollectionStructureTest.php
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -3,28 +3,45 @@
 namespace Tests\Data\Structures;
 
 use Statamic\Contracts\Entries\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Stache\Query\EntryQueryBuilder;
 use Statamic\Structures\CollectionStructure;
 
 class CollectionStructureTest extends StructureTestCase
 {
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->entryQueryBuilder = $this->mock(EntryQueryBuilder::class);
+        $this->entryQueryBuilder->shouldReceive('get')->andReturnUsing(function () {
+            return $this->queryBuilderGetReturnValue();
+        });
+
+        $this->collection = $this->mock(Collection::class);
+        $this->collection->shouldReceive('queryEntries')->andReturn($this->entryQueryBuilder);
+    }
+
     function structure($handle = null)
     {
         if ($handle !== null) {
             throw new \Exception('Handle should not be set in the test');
         }
 
-        return new CollectionStructure;
+        return (new CollectionStructure)->collection($this->collection);
+    }
+
+    function queryBuilderGetReturnValue()
+    {
+        return $this->queryBuilderGetReturnValue ?? collect();
     }
 
     /** @test */
     function the_handle_comes_from_the_collection()
     {
-        $collection = $this->mock(Collection::class);
-        $collection->shouldReceive('handle')->once()->andReturn('test');
-
-        $structure = $this->structure()->collection($collection);
+        $this->collection->shouldReceive('handle')->once()->andReturn('test');
 
-        $this->assertEquals('collection::test', $structure->collection($collection)->handle());
+        $this->assertEquals('collection::test', $this->structure()->handle());
     }
 
     /** @test */
@@ -110,12 +127,9 @@ function entries_may_only_appear_in_the_tree_once()
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Duplicate entry [123] in [test] collection\'s structure.');
-
-        $collection = $this->mock(Collection::class);
-        $collection->shouldReceive('handle')->once()->andReturn('test');
+        $this->collection->shouldReceive('handle')->once()->andReturn('test');
 
         $this->structure()
-            ->collection($collection)
             ->validateTree([
                 [
                     'entry' => '123',
@@ -131,6 +145,77 @@ function entries_may_only_appear_in_the_tree_once()
             ]);
     }
 
+    /** @test */
+    function the_tree_root_can_have_children_when_not_expecting_root()
+    {
+        $this->queryBuilderGetReturnValue = collect([
+            Entry::make()->id('123'),
+            Entry::make()->id('456'),
+        ]);
+
+        parent::the_tree_root_can_have_children_when_not_expecting_root();
+    }
+
+    /** @test */
+    function only_entries_belonging_to_the_associated_collection_may_be_in_the_tree()
+    {
+        $this->collection->shouldReceive('handle')->once()->andReturn('test');
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Only entries from the [test] collection may be in its structure. Encountered ID of [3]');
+
+        $this->queryBuilderGetReturnValue = collect([
+            Entry::make()->id('1'),
+            Entry::make()->id('2'),
+        ]);
+
+        $this->structure()->validateTree([
+            [
+                'entry' => '1',
+                'children' => [
+                    ['entry' => '2']
+                ]
+            ],
+            ['entry' => '3'],
+        ]);
+    }
+
+    /** @test */
+    function entries_not_explicitly_in_the_tree_should_be_appended_to_the_end_of_the_tree()
+    {
+        $this->queryBuilderGetReturnValue = collect([
+            Entry::make()->id('1'),
+            Entry::make()->id('2'),
+            Entry::make()->id('3'),
+            Entry::make()->id('4'),
+            Entry::make()->id('5'),
+        ]);
+
+        $actual = $this->structure()->validateTree([
+            [
+                'entry' => '1',
+                'children' => [
+                    ['entry' => '2']
+                ]
+            ],
+            ['entry' => '3'],
+        ]);
+
+        $expected = [
+            [
+                'entry' => '1',
+                'children' => [
+                    ['entry' => '2']
+                ]
+            ],
+            ['entry' => '3'],
+            ['entry' => '4'],
+            ['entry' => '5'],
+        ];
+
+        $this->assertEquals($expected, $actual);
+    }
+
     /** @test */
     function it_saves_through_the_collection()
     {
diff --git a/tests/Data/Structures/StructureTestCase.php b/tests/Data/Structures/StructureTestCase.php
index 21fa7cea6e6..569ef4c7041 100644
--- a/tests/Data/Structures/StructureTestCase.php
+++ b/tests/Data/Structures/StructureTestCase.php
@@ -35,7 +35,7 @@ function the_tree_root_cannot_have_children_when_expecting_root()
     /** @test */
     function the_tree_root_can_have_children_when_not_expecting_root()
     {
-        $this->assertNull($this->structure()->expectsRoot(false)->validateTree([
+        $tree = [
             [
                 'entry' => '123',
                 'children' => [
@@ -44,7 +44,9 @@ function the_tree_root_can_have_children_when_not_expecting_root()
                     ]
                 ]
             ]
-        ]));
+        ];
+
+        $this->assertEquals($tree, $this->structure()->expectsRoot(false)->validateTree($tree));
     }
 
     /** @test */
@@ -64,17 +66,19 @@ function the_root_must_be_an_entry_when_expecting_root()
     /** @test */
     function the_root_doesnt_need_to_be_an_entry_if_the_tree_is_empty()
     {
-        $this->assertNull($this->structure()->expectsRoot(true)->validateTree([]));
+        $this->assertEquals([], $this->structure()->expectsRoot(true)->validateTree([]));
     }
 
     /** @test **/
     function the_root_doesnt_need_to_be_an_entry_when_not_expecting_root()
     {
-        $this->assertNull($this->structure()->expectsRoot(false)->validateTree([
+        $tree = [
             [
                 'title' => 'Not an entry',
                 'url' => '/test',
             ]
-        ]));
+        ];
+
+        $this->assertEquals($tree, $this->structure()->expectsRoot(false)->validateTree($tree));
     }
 }
diff --git a/tests/Data/Structures/TreeTest.php b/tests/Data/Structures/TreeTest.php
index f24713e118d..4402602f967 100644
--- a/tests/Data/Structures/TreeTest.php
+++ b/tests/Data/Structures/TreeTest.php
@@ -297,7 +297,7 @@ function the_structure_validates_the_tree_when_setting_it()
 
         $treeContents = ['the' => 'tree'];
 
-        $structure->shouldReceive('validateTree')->with($treeContents)->once()->andReturnNull();
+        $structure->shouldReceive('validateTree')->with($treeContents)->once()->andReturn($treeContents);
 
         $tree = (new Tree)->structure($structure);
 
diff --git a/tests/Feature/Entries/ReorderEntriesTest.php b/tests/Feature/Entries/ReorderEntriesTest.php
index 41910f89715..5d5c4797ef0 100644
--- a/tests/Feature/Entries/ReorderEntriesTest.php
+++ b/tests/Feature/Entries/ReorderEntriesTest.php
@@ -63,16 +63,16 @@ function it_denies_access_if_the_collection_is_not_orderable()
     /** @test */
     function it_reorders_entries()
     {
+        EntryFactory::id('1')->slug('one')->collection('test')->create();
+        EntryFactory::id('2')->slug('two')->collection('test')->create();
+        EntryFactory::id('3')->slug('three')->collection('test')->create();
+
         $this->structure->in('en')->tree([
             ['entry' => '1'],
             ['entry' => '2'],
             ['entry' => '3'],
         ])->save();
 
-        EntryFactory::id('1')->slug('one')->collection('test')->create();
-        EntryFactory::id('2')->slug('two')->collection('test')->create();
-        EntryFactory::id('3')->slug('three')->collection('test')->create();
-
         $this->setTestRoles(['test' => ['access cp', 'reorder test entries']]);
         $user = tap(User::make()->assignRole('test'))->save();
 
@@ -94,16 +94,6 @@ function it_reorders_entries()
     /** @test */
     function it_reorders_paginated_entries()
     {
-        $this->structure->in('en')->tree([
-            ['entry' => '1'],
-            ['entry' => '2'],
-            ['entry' => '3'],
-            ['entry' => '4'],
-            ['entry' => '5'],
-            ['entry' => '6'],
-            ['entry' => '7'],
-        ])->save();
-
         EntryFactory::id('1')->slug('one')->collection('test')->create();
         EntryFactory::id('2')->slug('two')->collection('test')->create();
         EntryFactory::id('3')->slug('three')->collection('test')->create();
@@ -114,6 +104,16 @@ function it_reorders_paginated_entries()
         // ends here
         EntryFactory::id('7')->slug('seven')->collection('test')->create();
 
+        $this->structure->in('en')->tree([
+            ['entry' => '1'],
+            ['entry' => '2'],
+            ['entry' => '3'],
+            ['entry' => '4'],
+            ['entry' => '5'],
+            ['entry' => '6'],
+            ['entry' => '7'],
+        ])->save();
+
         $this->setTestRoles(['test' => ['access cp', 'reorder test entries']]);
         $user = tap(User::make()->assignRole('test'))->save();
 
diff --git a/tests/Tags/Collection/CollectionTest.php b/tests/Tags/Collection/CollectionTest.php
index 80470c51ad3..931f50fc588 100644
--- a/tests/Tags/Collection/CollectionTest.php
+++ b/tests/Tags/Collection/CollectionTest.php
@@ -322,6 +322,16 @@ function it_can_get_previous_and_next_entries_in_a_dated_asc_collection()
     /** @test */
     function it_can_get_previous_and_next_entries_in_an_orderable_asc_collection()
     {
+        $this->makeEntry($this->foods, 'a')->set('title', 'Apple')->save();
+        $this->makeEntry($this->foods, 'b')->set('title', 'Banana')->save();
+        $this->makeEntry($this->foods, 'c')->set('title', 'Carrot')->save();
+        $this->makeEntry($this->foods, 'd')->set('title', 'Danish')->save();
+        $this->makeEntry($this->foods, 'e')->set('title', 'Egg')->save();
+        $this->makeEntry($this->foods, 'f')->set('title', 'Fig')->save();
+        $this->makeEntry($this->foods, 'g')->set('title', 'Grape')->save();
+        $this->makeEntry($this->foods, 'h')->set('title', 'Hummus')->save();
+        $this->makeEntry($this->foods, 'i')->set('title', 'Ice Cream')->save();
+
         $structure = $this->makeStructure([
             ['entry' => 'c'], // Carrot
             ['entry' => 'h'], // Hummus
@@ -332,20 +342,10 @@ function it_can_get_previous_and_next_entries_in_an_orderable_asc_collection()
             ['entry' => 'g'], // Grape
             ['entry' => 'e'], // Egg
             ['entry' => 'd'], // Danish
-        ])->maxDepth(1);
+        ], $this->foods)->maxDepth(1);
 
         $this->foods->structure($structure)->save();
 
-        $this->makeEntry($this->foods, 'a')->set('title', 'Apple')->save();
-        $this->makeEntry($this->foods, 'b')->set('title', 'Banana')->save();
-        $this->makeEntry($this->foods, 'c')->set('title', 'Carrot')->save();
-        $this->makeEntry($this->foods, 'd')->set('title', 'Danish')->save();
-        $this->makeEntry($this->foods, 'e')->set('title', 'Egg')->save();
-        $this->makeEntry($this->foods, 'f')->set('title', 'Fig')->save();
-        $this->makeEntry($this->foods, 'g')->set('title', 'Grape')->save();
-        $this->makeEntry($this->foods, 'h')->set('title', 'Hummus')->save();
-        $this->makeEntry($this->foods, 'i')->set('title', 'Ice Cream')->save();
-
         $currentId = $this->findEntryByTitle('Banana')->id();
 
         $orderBy = 'order:asc';
@@ -371,6 +371,16 @@ function it_can_get_previous_and_next_entries_in_an_orderable_asc_collection()
     /** @test */
     function it_can_get_previous_and_next_entries_in_an_orderable_desc_collection()
     {
+        $this->makeEntry($this->foods, 'a')->set('title', 'Apple')->save();
+        $this->makeEntry($this->foods, 'b')->set('title', 'Banana')->save();
+        $this->makeEntry($this->foods, 'c')->set('title', 'Carrot')->save();
+        $this->makeEntry($this->foods, 'd')->set('title', 'Danish')->save();
+        $this->makeEntry($this->foods, 'e')->set('title', 'Egg')->save();
+        $this->makeEntry($this->foods, 'f')->set('title', 'Fig')->save();
+        $this->makeEntry($this->foods, 'g')->set('title', 'Grape')->save();
+        $this->makeEntry($this->foods, 'h')->set('title', 'Hummus')->save();
+        $this->makeEntry($this->foods, 'i')->set('title', 'Ice Cream')->save();
+
         $structure = $this->makeStructure([
             ['entry' => 'c'], // Carrot
             ['entry' => 'h'], // Hummus
@@ -381,20 +391,10 @@ function it_can_get_previous_and_next_entries_in_an_orderable_desc_collection()
             ['entry' => 'g'], // Grape
             ['entry' => 'e'], // Egg
             ['entry' => 'd'], // Danish
-        ])->maxDepth(1);
+        ], $this->foods)->maxDepth(1);
 
         $this->foods->structure($structure)->save();
 
-        $this->makeEntry($this->foods, 'a')->set('title', 'Apple')->save();
-        $this->makeEntry($this->foods, 'b')->set('title', 'Banana')->save();
-        $this->makeEntry($this->foods, 'c')->set('title', 'Carrot')->save();
-        $this->makeEntry($this->foods, 'd')->set('title', 'Danish')->save();
-        $this->makeEntry($this->foods, 'e')->set('title', 'Egg')->save();
-        $this->makeEntry($this->foods, 'f')->set('title', 'Fig')->save();
-        $this->makeEntry($this->foods, 'g')->set('title', 'Grape')->save();
-        $this->makeEntry($this->foods, 'h')->set('title', 'Hummus')->save();
-        $this->makeEntry($this->foods, 'i')->set('title', 'Ice Cream')->save();
-
         $currentId = $this->findEntryByTitle('Banana')->id();
 
         $orderBy = 'order:desc';
@@ -460,10 +460,14 @@ protected function runTagAndGetTitles($tagMethod)
         return $this->collectionTag->{$tagMethod}()->map->get('title')->values()->all();
     }
 
-    protected function makeStructure($tree = [])
+    protected function makeStructure($tree = [], $collection = null)
     {
-        return (new CollectionStructure)->tap(function ($s) use ($tree) {
-            $s->addTree($s->makeTree('en')->tree($tree));
-        });
+        $structure = new CollectionStructure;
+
+        if ($collection) {
+            $structure->collection($collection);
+        }
+
+        return $structure->addTree($structure->makeTree('en')->tree($tree));
     }
 }
diff --git a/tests/Tags/Collection/EntriesTest.php b/tests/Tags/Collection/EntriesTest.php
index 88165cdeffd..783a83e955b 100644
--- a/tests/Tags/Collection/EntriesTest.php
+++ b/tests/Tags/Collection/EntriesTest.php
@@ -328,7 +328,7 @@ function it_can_sort_a_linear_structured_collection()
         $this->makeEntry('b')->save();
         $this->makeEntry('c')->save();
 
-        $structure = (new CollectionStructure)->maxDepth(1)->tap(function ($s) {
+        $structure = (new CollectionStructure)->collection($this->collection)->maxDepth(1)->tap(function ($s) {
             $s->addTree($s->makeTree('en')->tree([
                 ['entry' => 'b'],
                 ['entry' => 'c'],

From 5561bf695485c6e8965a37cc62a35d97bb931f2a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 15:29:29 -0500
Subject: [PATCH 042/137] Require version of blink that fixed numeric keys
 issue

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3ec024a61b1..295e84e6428 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "pixelfear/composer-dist-plugin": "^0.1.0",
         "scrumpy/html-to-prosemirror": "^0.6.0",
         "scrumpy/prosemirror-to-html": "^0.8.0",
-        "spatie/blink": "^1.1",
+        "spatie/blink": "^1.1.2",
         "statamic/stringy": "^3.1",
         "symfony/var-exporter": "^4.3",
         "symfony/yaml": "^4.1@dev",

From 49daccd1edb3e5743b89ec48861edf61c84452c7 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 15:32:33 -0500
Subject: [PATCH 043/137] Remove old logic to add missing entries to the tree
 yaml

---
 src/Stache/Stores/CollectionEntriesStore.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Stache/Stores/CollectionEntriesStore.php b/src/Stache/Stores/CollectionEntriesStore.php
index 2283779fb31..0c84656c4c7 100644
--- a/src/Stache/Stores/CollectionEntriesStore.php
+++ b/src/Stache/Stores/CollectionEntriesStore.php
@@ -90,15 +90,6 @@ public function makeItemFromFile($path, $contents)
     protected function handleModifiedItem($item)
     {
         $item->taxonomize();
-
-        if ($item->collection()->hasStructure()) {
-            $tree = $item->collection()->structure()->in($item->locale());
-            $pages = $tree->flattenedPages()->keyBy->id();
-
-            if (! $pages->has($item->id())) {
-                $tree->append($item)->save();
-            }
-        }
     }
 
     protected function storeIndexes()

From 19783bbfdeb980cd65b336ae406f2a8bae84f485 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 15:32:57 -0500
Subject: [PATCH 044/137] Create first link button instead of entry

---
 resources/js/components/structures/PageTree.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 0ec80640431..9666f7a2cae 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -12,14 +12,7 @@
                 <p class="text-grey mb-3">
                     {{ __('messages.structures_empty') }}
                 </p>
-                <button v-if="!hasCollection" class="btn-primary btn-lg" v-text="__('Create first link')" @click="openPageCreator" />
-
-                <create-entry-button
-                    v-if="hasCollection"
-                    button-class="btn-primary"
-                    :url="createEntryUrl()"
-                    :blueprints="collectionBlueprints"
-                    :text="__('Create first link')" />
+                <button class="btn-primary btn-lg" v-text="__('Create first link')" @click="openPageCreator" />
             </div>
         </div>
 

From 00bcd3b9b38e3ba7279785c01559e15fe106a4f3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 15:47:22 -0500
Subject: [PATCH 045/137] Set the initial view when mounted. The 'immediate'
 watcher was kicking in too fast and overriding the stored view.

---
 resources/js/components/collections/View.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 7a6ef645caf..c0d7c997f81 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -121,7 +121,7 @@ export default {
     data() {
         return {
             mounted: false,
-            view: this.initialView(),
+            view: null,
         }
     },
 
@@ -143,18 +143,16 @@ export default {
 
     watch: {
 
-        view: {
-            immediate: true,
-            handler(view) {
-                this.$config.set('wrapperClass', view === 'tree' ? undefined : 'max-w-full');
+        view(view) {
+            this.$config.set('wrapperClass', view === 'tree' ? undefined : 'max-w-full');
 
-                localStorage.setItem('statamic.collection-view.'+this.handle, view);
-            }
+            localStorage.setItem('statamic.collection-view.'+this.handle, view);
         }
 
     },
 
     mounted() {
+        this.view = this.initialView();
         this.mounted = true;
     },
 

From e4e7b18fcce0e3c57ae997c61751d2a7e01d99ee Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 16:03:30 -0500
Subject: [PATCH 046/137] Adjust breadcrumbs to not use old structure urls

---
 src/Http/Controllers/CP/Collections/EntriesController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index e0c861c11ef..2af7fe0bd3a 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -399,12 +399,12 @@ protected function breadcrumbs($collection)
     {
         return new Breadcrumbs([
             [
-                'text' => $collection->hasStructure() ? __('Structures') : __('Collections'),
-                'url' => $collection->hasStructure() ? cp_route('structures.index') : cp_route('collections.index'),
+                'text' => __('Collections'),
+                'url' => cp_route('collections.index'),
             ],
             [
                 'text' => $collection->title(),
-                'url' => $collection->hasStructure() ? $collection->structure()->showUrl() : $collection->showUrl(),
+                'url' => $collection->showUrl(),
             ]
         ]);
     }

From 2121e378dc1e00c91b702768dacbc8b6f5252d32 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 2 Mar 2020 17:43:47 -0500
Subject: [PATCH 047/137] Blink the collection's structure

---
 src/Entries/Collection.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 411704e45fc..b73e160e4f6 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -447,10 +447,12 @@ public function structure($structure = null)
         return $this
             ->fluentlyGetOrSet('structure')
             ->getter(function ($structure) {
-                if (! $structure && $this->structureContents) {
-                    $structure = $this->structure = $this->makeStructureFromContents();
-                }
-                return $structure;
+                return Blink::once("collection-{$this->id()}-structure", function () use ($structure) {
+                    if (! $structure && $this->structureContents) {
+                        $structure = $this->structure = $this->makeStructureFromContents();
+                    }
+                    return $structure;
+                });
             })
             ->setter(function ($structure) {
                 if ($structure) {
@@ -458,6 +460,7 @@ public function structure($structure = null)
                 } else {
                     $this->structureContents = null;
                 }
+                Blink::forget("collection-{$this->id()}-structure");
                 return $structure;
             })
             ->args(func_get_args());
@@ -467,6 +470,10 @@ public function structureContents(array $contents = null)
     {
         return $this
             ->fluentlyGetOrSet('structureContents')
+            ->setter(function ($contents) {
+                Blink::forget("collection-{$this->id()}-structure");
+                return $contents;
+            })
             ->args(func_get_args());
     }
 

From 5a86c01ee2bbe9437a8726802b4109e2367afcb0 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 3 Mar 2020 19:45:55 -0500
Subject: [PATCH 048/137] Pages forward calls onto the entry

---
 src/Structures/Page.php            |  8 +++++++-
 tests/Data/Structures/PageTest.php | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index d9d797ae9c8..b06f3fbf8da 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -9,13 +9,14 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Routing\UrlBuilder;
 use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Facades\Blink;
 
 class Page implements Entry, Augmentable, Responsable
 {
-    use HasAugmentedInstance;
+    use HasAugmentedInstance, ForwardsCalls;
 
     protected $tree;
     protected $reference;
@@ -297,4 +298,9 @@ public function collection()
     {
         return Collection::findByMount($this);
     }
+
+    public function __call($method, $args)
+    {
+        return $this->forwardCallTo($this->entry(), $method, $args);
+    }
 }
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index af571fcc6b2..bd85c54146e 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -205,4 +205,17 @@ public function slug($slug = null) { return 'four'; }
         $this->assertEveryItemIsInstanceOf(Page::class, $flattened);
         $this->assertEquals(['one', 'two', 'three', 'four'], $flattened->map->reference()->all());
     }
+
+    /** @test */
+    function it_forwards_calls_to_the_entry()
+    {
+        $entry = $this->mock(Entry::class);
+        $entry->shouldReceive('id')->andReturn('1');
+        $entry->shouldReceive('testing')->with('123')->once()->andReturn('hello');
+
+        $page = new Page;
+        $page->setEntry($entry);
+
+        $this->assertEquals('hello', $page->testing('123'));
+    }
 }

From 633b4d0ef353a3f52f80895d8cac7312ee457802 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 3 Mar 2020 19:47:09 -0500
Subject: [PATCH 049/137] Pages can redirect to their first child

---
 src/Http/Responses/DataResponse.php   |  3 ++
 src/Routing/ResolveRedirect.php       | 32 ++++++++++++
 src/Structures/Page.php               |  2 +-
 tests/Routing/ResolveRedirectTest.php | 74 +++++++++++++++++++++++++++
 4 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 src/Routing/ResolveRedirect.php
 create mode 100644 tests/Routing/ResolveRedirectTest.php

diff --git a/src/Http/Responses/DataResponse.php b/src/Http/Responses/DataResponse.php
index b5931d8ed5b..83d00ed6831 100644
--- a/src/Http/Responses/DataResponse.php
+++ b/src/Http/Responses/DataResponse.php
@@ -10,6 +10,7 @@
 use Statamic\Auth\Protect\Protection;
 use Illuminate\Contracts\Support\Responsable;
 use Statamic\Exceptions\NotFoundHttpException;
+use Statamic\Routing\ResolveRedirect;
 
 class DataResponse implements Responsable
 {
@@ -87,6 +88,8 @@ protected function getRedirect()
             return;
         }
 
+        $redirect = (new ResolveRedirect)($redirect, $this->data);
+
         if ($redirect == '404') {
             throw new NotFoundHttpException;
         }
diff --git a/src/Routing/ResolveRedirect.php b/src/Routing/ResolveRedirect.php
new file mode 100644
index 00000000000..2a74212a2bf
--- /dev/null
+++ b/src/Routing/ResolveRedirect.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Statamic\Routing;
+
+use Statamic\Structures\Page;
+
+class ResolveRedirect
+{
+    public function __invoke($redirect, $parent = null)
+    {
+        if ($redirect === '@child') {
+            return $this->firstChildUrl($parent);
+        }
+
+        return $redirect;
+    }
+
+    private function firstChildUrl($parent)
+    {
+        if (!$parent || !$parent instanceof Page) {
+            throw new \Exception("Cannot resolve a page's child redirect without providing a page.");
+        }
+
+        $children = $parent->pages()->all();
+
+        if (empty($children)) {
+            return '404';
+        }
+
+        return $children->first()->url();
+    }
+}
diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index b06f3fbf8da..a3589ec0885 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -273,7 +273,7 @@ public function site()
     public function toResponse($request)
     {
         if ($this->reference && $this->referenceExists()) {
-            return $this->entry()->toResponse($request);
+            return (new \Statamic\Http\Responses\DataResponse($this))->toResponse($request);
         }
 
         throw new \LogicException('A page without a reference to an entry cannot be rendered.');
diff --git a/tests/Routing/ResolveRedirectTest.php b/tests/Routing/ResolveRedirectTest.php
new file mode 100644
index 00000000000..3663f1f134c
--- /dev/null
+++ b/tests/Routing/ResolveRedirectTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Tests\Routing;
+
+use Mockery;
+use PHPUnit\Framework\TestCase;
+use Statamic\Structures\Page;
+use Statamic\Structures\Pages;
+use Statamic\Routing\ResolveRedirect;
+
+class ResolveRedirectTest extends TestCase
+{
+    /** @test */
+    public function it_resolves_standard_redirects()
+    {
+        $resolver = new ResolveRedirect;
+
+        $this->assertEquals('http://test.com', $resolver('http://test.com'));
+        $this->assertEquals('https://test.com', $resolver('https://test.com'));
+        $this->assertEquals('/test', $resolver('/test'));
+        $this->assertEquals('test', $resolver('test'));
+        $this->assertEquals('404', $resolver('404'));
+    }
+
+    /** @test */
+    function it_cant_resolve_a_first_child_without_a_parent()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Cannot resolve a page\'s child redirect without providing a page.');
+
+        $resolver = new ResolveRedirect;
+
+        $this->assertEquals('/page/child', $resolver('@child'));
+    }
+
+    /** @test */
+    function it_cannot_resolve_a_first_child_redirect_if_the_parent_is_not_a_page()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Cannot resolve a page\'s child redirect without providing a page.');
+
+        $resolver = new ResolveRedirect;
+
+        $this->assertEquals('/page/child', $resolver('@child', 'not a page object'));
+    }
+
+    /** @test */
+    function it_resolves_first_child()
+    {
+        $resolver = new ResolveRedirect;
+
+        $child = Mockery::mock(Page::class);
+        $child->shouldReceive('url')->andReturn('/parent/first-child');
+
+        $children = Mockery::mock(Pages::class);
+        $children->shouldReceive('all')->andReturn(collect([$child]));
+
+        $parent = Mockery::mock(Page::class);
+        $parent->shouldReceive('pages')->andReturn($children);
+
+        $this->assertEquals('/parent/first-child', $resolver('@child', $parent));
+    }
+
+    /** @test */
+    function a_parent_without_a_child_resolves_to_a_404()
+    {
+        $resolver = new ResolveRedirect;
+
+        $parent = Mockery::mock(Page::class);
+        $parent->shouldReceive('pages')->andReturn(collect([]));
+
+        $this->assertEquals('404', $resolver('@child', $parent));
+    }
+}

From 0c36dd9f734f5cb421d0c27f20de5a481805098d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 10:26:07 -0500
Subject: [PATCH 050/137] Initial redirect fieldtype

---
 resources/js/bootstrap/fieldtypes.js          |  1 +
 .../fieldtypes/RedirectFieldtype.vue          | 64 +++++++++++++++++++
 src/Fieldtypes/Redirect.php                   | 14 ++++
 src/Providers/ExtensionServiceProvider.php    |  1 +
 4 files changed, 80 insertions(+)
 create mode 100644 resources/js/components/fieldtypes/RedirectFieldtype.vue
 create mode 100644 src/Fieldtypes/Redirect.php

diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index 6c93d18903a..ba24c3513d6 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -37,6 +37,7 @@ Vue.component('list-fieldtype', require('../components/fieldtypes/ListFieldtype.
 Vue.component('markdown-fieldtype', require('../components/fieldtypes/MarkdownFieldtype.vue').default);
 Vue.component('radio-fieldtype', require('../components/fieldtypes/RadioFieldtype.vue').default);
 Vue.component('range-fieldtype', require('../components/fieldtypes/RangeFieldtype.vue').default);
+Vue.component('redirect-fieldtype', require('../components/fieldtypes/RedirectFieldtype.vue').default);
 Vue.component('relationship-fieldtype', require('../components/fieldtypes/relationship/RelationshipFieldtype.vue').default);
 Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue').default);
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
new file mode 100644
index 00000000000..f8c2ad48c7f
--- /dev/null
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -0,0 +1,64 @@
+<template>
+    <div class="flex items-center">
+        <div class="mr-2">
+            <toggle-fieldtype handle="enabled" v-model="enabled" />
+        </div>
+        <div class="w-32 mr-2">
+            <v-select
+                v-if="enabled"
+                v-model="option"
+                :options="options"
+                :clearable="false"
+                :reduce="(option) => option.value"
+            />
+        </div>
+        <div class="flex-1">
+            <text-input
+                v-if="enabled && option === 'url'"
+                :value="value"
+                @input="update($event)" />
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+
+    mixins: [Fieldtype],
+
+    data() {
+        return {
+            enabled: this.value != null,
+            option: 'url',
+            options: [
+                {label: 'URL', value: 'url'},
+                {label: 'First Child', value: 'first-child'},
+            ]
+        }
+    },
+
+    watch: {
+        option(option, oldOption) {
+            if (option === 'first-child') {
+                this.update('@child');
+            }
+        },
+
+        enabled(enabled) {
+            if (enabled) {
+                this.option = 'url';
+            } else {
+                this.option = null;
+                this.update(null);
+            }
+        }
+    },
+
+    created() {
+        if (this.value === '@child') {
+            this.option = 'first-child';
+        }
+    }
+
+}
+</script>
diff --git a/src/Fieldtypes/Redirect.php b/src/Fieldtypes/Redirect.php
new file mode 100644
index 00000000000..8f988ce73f3
--- /dev/null
+++ b/src/Fieldtypes/Redirect.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Statamic\Fieldtypes;
+
+use Statamic\Fields\Fieldtype;
+use Statamic\Routing\ResolveRedirect;
+
+class Redirect extends Fieldtype
+{
+    public function augment($value)
+    {
+        return (new ResolveRedirect)($value, $this->field->parent());
+    }
+}
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index d5a723caad4..5fd9eb5a90c 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -82,6 +82,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\NestedFields::class,
         Fieldtypes\Radio::class,
         Fieldtypes\Range::class,
+        Fieldtypes\Redirect::class,
         Fieldtypes\Replicator::class,
         Fieldtypes\Revealer::class,
         Fieldtypes\Section::class,

From 6f9f71afe443c4c173ddf86bbf6e61af016e4e20 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 11:00:27 -0500
Subject: [PATCH 051/137] If it's required, don't show the toggle

---
 resources/js/components/fieldtypes/RedirectFieldtype.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
index f8c2ad48c7f..5b08ca4c6c0 100644
--- a/resources/js/components/fieldtypes/RedirectFieldtype.vue
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="flex items-center">
-        <div class="mr-2">
+        <div class="mr-2" v-if="!config.required">
             <toggle-fieldtype handle="enabled" v-model="enabled" />
         </div>
         <div class="w-32 mr-2">
@@ -58,6 +58,10 @@ export default {
         if (this.value === '@child') {
             this.option = 'first-child';
         }
+
+        if (this.config.required) {
+            this.enabled = true;
+        }
     }
 
 }

From e9213cc50fd25d8e5a598b6de3bac88faae2cb9d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 11:40:17 -0500
Subject: [PATCH 052/137] Entry can get its corresponding page

---
 src/Entries/Entry.php            |  7 ++++++-
 tests/Data/Entries/EntryTest.php | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index ae664f50669..cb5ff88b519 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -490,6 +490,11 @@ public function hasStructure()
     }
 
     public function parent()
+    {
+        return optional($this->page())->parent();
+    }
+
+    public function page()
     {
         if (! $this->hasStructure()) {
             return null;
@@ -499,7 +504,7 @@ public function parent()
             return null;
         }
 
-        return $this->structure()->in($this->locale())->page($id)->parent();
+        return $this->structure()->in($this->locale())->page($id);
     }
 
     public function route()
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index a7319b20471..0467a6afccc 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -14,6 +14,10 @@
 use Statamic\Facades\User;
 use Statamic\Fields\Blueprint;
 use Statamic\Sites\Site;
+use Statamic\Structures\CollectionStructure;
+use Statamic\Structures\Page;
+use Statamic\Structures\Pages;
+use Statamic\Structures\Tree;
 use Statamic\Support\Arr;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -663,5 +667,35 @@ function it_deletes_through_the_api()
         $this->assertTrue($return);
     }
 
+    /** @test */
+    function it_gets_the_corresponding_page_from_the_collections_structure()
+    {
+        $parentPage = $this->mock(Page::class);
+        $page = $this->mock(Page::class);
+        $page->shouldReceive('parent')->andReturn($parentPage);
+        $tree = $this->partialMock(Tree::class);
+        $tree->locale('en');
+        $tree->shouldReceive('page')->with('entry-id')->andReturn($page);
+
+        $structure = new CollectionStructure;
+        $structure->addTree($tree);
+        $collection = tap(Collection::make('test')->structure($structure))->save();
+
+        $entry = (new Entry)->id('entry-id')->locale('en')->collection($collection);
+
+        $this->assertSame($page, $entry->page());
+        $this->assertSame($parentPage, $entry->parent());
+    }
+
+    /** @test */
+    function no_page_is_returned_when_the_collection_isnt_using_a_structure()
+    {
+        $collection = tap(Collection::make('test'))->save();
+        $entry = (new Entry)->id('entry-id')->locale('en')->collection($collection);
+
+        $this->assertNull($entry->page());
+        $this->assertNull($entry->parent());
+    }
+
     // todo: add tests for localization things. in(), descendants(), addLocalization(), etc
 }

From acae1344a553a7d96103436dd1b899254c5d4a0a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 11:40:36 -0500
Subject: [PATCH 053/137] Redirects can be resolved through entries

---
 src/Routing/ResolveRedirect.php       |  9 +++++++--
 tests/Routing/ResolveRedirectTest.php | 28 +++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/Routing/ResolveRedirect.php b/src/Routing/ResolveRedirect.php
index 2a74212a2bf..6db95acf643 100644
--- a/src/Routing/ResolveRedirect.php
+++ b/src/Routing/ResolveRedirect.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Routing;
 
+use Statamic\Contracts\Entries\Entry;
 use Statamic\Structures\Page;
 
 class ResolveRedirect
@@ -17,13 +18,17 @@ public function __invoke($redirect, $parent = null)
 
     private function firstChildUrl($parent)
     {
-        if (!$parent || !$parent instanceof Page) {
+        if (!$parent || !$parent instanceof Entry) {
             throw new \Exception("Cannot resolve a page's child redirect without providing a page.");
         }
 
+        if (!$parent instanceof Page && $parent instanceof Entry) {
+            $parent = $parent->page();
+        }
+
         $children = $parent->pages()->all();
 
-        if (empty($children)) {
+        if ($children->isEmpty()) {
             return '404';
         }
 
diff --git a/tests/Routing/ResolveRedirectTest.php b/tests/Routing/ResolveRedirectTest.php
index 3663f1f134c..bf9052ac7e9 100644
--- a/tests/Routing/ResolveRedirectTest.php
+++ b/tests/Routing/ResolveRedirectTest.php
@@ -4,9 +4,10 @@
 
 use Mockery;
 use PHPUnit\Framework\TestCase;
+use Statamic\Contracts\Entries\Entry;
+use Statamic\Routing\ResolveRedirect;
 use Statamic\Structures\Page;
 use Statamic\Structures\Pages;
-use Statamic\Routing\ResolveRedirect;
 
 class ResolveRedirectTest extends TestCase
 {
@@ -61,13 +62,36 @@ function it_resolves_first_child()
         $this->assertEquals('/parent/first-child', $resolver('@child', $parent));
     }
 
+    /** @test */
+    function it_resolves_first_child_through_an_entry()
+    {
+        $resolver = new ResolveRedirect;
+
+        $child = Mockery::mock(Page::class);
+        $child->shouldReceive('url')->andReturn('/parent/first-child');
+
+        $children = Mockery::mock(Pages::class);
+        $children->shouldReceive('all')->andReturn(collect([$child]));
+
+        $parentPage = Mockery::mock(Page::class);
+        $parentPage->shouldReceive('pages')->andReturn($children);
+
+        $parent = Mockery::mock(Entry::class);
+        $parent->shouldReceive('page')->andReturn($parentPage);
+
+        $this->assertEquals('/parent/first-child', $resolver('@child', $parent));
+    }
+
     /** @test */
     function a_parent_without_a_child_resolves_to_a_404()
     {
         $resolver = new ResolveRedirect;
 
+        $pages = Mockery::mock(Pages::class);
+        $pages->shouldReceive('all')->andReturn(collect([]));
+
         $parent = Mockery::mock(Page::class);
-        $parent->shouldReceive('pages')->andReturn(collect([]));
+        $parent->shouldReceive('pages')->andReturn($pages);
 
         $this->assertEquals('404', $resolver('@child', $parent));
     }

From 82cade417328c95951d93c09903dcffdda4a45c9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 11:56:43 -0500
Subject: [PATCH 054/137] Handle nulls and 404 as an integer

---
 src/Routing/ResolveRedirect.php       | 6 +++---
 tests/Routing/ResolveRedirectTest.php | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Routing/ResolveRedirect.php b/src/Routing/ResolveRedirect.php
index 6db95acf643..0249ad4a7a8 100644
--- a/src/Routing/ResolveRedirect.php
+++ b/src/Routing/ResolveRedirect.php
@@ -10,10 +10,10 @@ class ResolveRedirect
     public function __invoke($redirect, $parent = null)
     {
         if ($redirect === '@child') {
-            return $this->firstChildUrl($parent);
+            $redirect = $this->firstChildUrl($parent);
         }
 
-        return $redirect;
+        return is_numeric($redirect) ? (int) $redirect : $redirect;
     }
 
     private function firstChildUrl($parent)
@@ -29,7 +29,7 @@ private function firstChildUrl($parent)
         $children = $parent->pages()->all();
 
         if ($children->isEmpty()) {
-            return '404';
+            return 404;
         }
 
         return $children->first()->url();
diff --git a/tests/Routing/ResolveRedirectTest.php b/tests/Routing/ResolveRedirectTest.php
index bf9052ac7e9..b24110e0007 100644
--- a/tests/Routing/ResolveRedirectTest.php
+++ b/tests/Routing/ResolveRedirectTest.php
@@ -20,7 +20,10 @@ public function it_resolves_standard_redirects()
         $this->assertEquals('https://test.com', $resolver('https://test.com'));
         $this->assertEquals('/test', $resolver('/test'));
         $this->assertEquals('test', $resolver('test'));
-        $this->assertEquals('404', $resolver('404'));
+        $this->assertSame(404, $resolver('404'));
+        $this->assertSame(404, $resolver(404));
+        $this->assertSame('4-oh-4', $resolver('4-oh-4')); // strings with numbers won't become ints
+        $this->assertNull($resolver(null));
     }
 
     /** @test */

From bdb10a191f830a8517f91d36662ed023ad6ab157 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 12:06:19 -0500
Subject: [PATCH 055/137] Redirect tag allows wildcard syntax, and accept
 Redirect fieldtype value objects.

---
 src/Tags/Redirect.php | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/Tags/Redirect.php b/src/Tags/Redirect.php
index 88a0fb7ecb6..07f927438a1 100644
--- a/src/Tags/Redirect.php
+++ b/src/Tags/Redirect.php
@@ -2,12 +2,40 @@
 
 namespace Statamic\Tags;
 
+use Statamic\Exceptions\NotFoundHttpException;
+use Statamic\Fields\Value;
 use Statamic\Tags\Tags;
 
 class Redirect extends Tags
 {
+    public function wildcard($tag)
+    {
+        return $this->redirect(
+            $this->context->get($tag)
+        );
+    }
+
     public function index()
     {
-        abort(redirect($this->get(['to', 'url']), $this->get('response', 302)));
+        return $this->redirect(
+            $this->get(['to', 'url'])
+        );
+    }
+
+    protected function redirect($location)
+    {
+        if ($location instanceof Value) {
+            $location = $location->value();
+        }
+
+        if ($location === 404) {
+            throw new NotFoundHttpException;
+        }
+
+        if (! $location) {
+            return;
+        }
+
+        abort(redirect($location, $this->get('response', 302)));
     }
 }

From 63d40c8b5237e922a5c668a2d89888f9d66ee337 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 12:13:21 -0500
Subject: [PATCH 056/137] Use mockery directly to make a partial mock ...

Make CI pass since partialMock is not available on early versions of laravel
---
 tests/Data/Entries/EntryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 0467a6afccc..c8b462f997b 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -673,7 +673,7 @@ function it_gets_the_corresponding_page_from_the_collections_structure()
         $parentPage = $this->mock(Page::class);
         $page = $this->mock(Page::class);
         $page->shouldReceive('parent')->andReturn($parentPage);
-        $tree = $this->partialMock(Tree::class);
+        $tree = \Mockery::mock(Tree::class)->makePartial();
         $tree->locale('en');
         $tree->shouldReceive('page')->with('entry-id')->andReturn($page);
 

From 4a1b565ad1995436ffd5947f026e82d9e5474cf6 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 12:17:26 -0500
Subject: [PATCH 057/137] Dupe partialMock so its available in earlier Laravel
 versions for CI

---
 tests/Data/Entries/EntryTest.php | 2 +-
 tests/TestCase.php               | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index c8b462f997b..0467a6afccc 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -673,7 +673,7 @@ function it_gets_the_corresponding_page_from_the_collections_structure()
         $parentPage = $this->mock(Page::class);
         $page = $this->mock(Page::class);
         $page->shouldReceive('parent')->andReturn($parentPage);
-        $tree = \Mockery::mock(Tree::class)->makePartial();
+        $tree = $this->partialMock(Tree::class);
         $tree->locale('en');
         $tree->shouldReceive('page')->with('entry-id')->andReturn($page);
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 066ca0ee537..f2a5f2fdf8c 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -157,4 +157,12 @@ protected function isRunningWindows()
     {
         return DIRECTORY_SEPARATOR === '\\';
     }
+
+    // This method is unavailable on earlier versions of Laravel.
+    public function partialMock($abstract, \Closure $mock = null)
+    {
+        $mock = \Mockery::mock(...array_filter(func_get_args()))->makePartial();
+        $this->app->instance($abstract, $mock);
+        return $mock;
+    }
 }

From c98a9a0b54201f42f1914d9bbc8614679efe8c01 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 4 Mar 2020 12:33:03 -0500
Subject: [PATCH 058/137] Entry link blueprint is appended on the fly so users
 can create redirects

---
 resources/blueprints/entry_link.yaml                  | 11 +++++++++++
 src/Entries/Collection.php                            |  6 ++++--
 .../CP/Collections/CollectionsController.php          |  4 +++-
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 resources/blueprints/entry_link.yaml

diff --git a/resources/blueprints/entry_link.yaml b/resources/blueprints/entry_link.yaml
new file mode 100644
index 00000000000..1ead5fbff40
--- /dev/null
+++ b/resources/blueprints/entry_link.yaml
@@ -0,0 +1,11 @@
+title: Link
+fields:
+  -
+    handle: title
+    field:
+      type: text
+  -
+    handle: redirect
+    field:
+      type: redirect
+      required: true
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index b73e160e4f6..608fa9f0279 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -176,8 +176,10 @@ public function entryBlueprints($blueprints = null)
         return $this
             ->fluentlyGetOrSet('blueprints')
             ->getter(function ($blueprints) {
-                if (is_null($blueprints)) {
-                    return collect([$this->fallbackEntryBlueprint()]);
+                $blueprints = $blueprints ?? [$this->fallbackEntryBlueprint()];
+
+                if ($this->hasStructure()) {
+                    $blueprints[] = 'entry_link';
                 }
 
                 return collect($blueprints)->map(function ($blueprint) {
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index f886f96d83e..1bb653ff931 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -128,7 +128,9 @@ public function edit($collection)
             'sort_direction' => $collection->sortDirection(),
             'max_depth' => optional($collection->structure())->maxDepth(),
             'expects_root' => optional($collection->structure())->expectsRoot(),
-            'blueprints' => $collection->entryBlueprints()->map->handle()->all(),
+            'blueprints' => $collection->entryBlueprints()->map->handle()->reject(function ($handle) {
+                return $handle == 'entry_link';
+            })->all(),
             'taxonomies' => $collection->taxonomies()->map->handle()->all(),
             'default_publish_state' => $collection->defaultPublishState(),
             'template' => $collection->template(),

From c3db4109dc4d2007948cf5d3cdce653781906aee Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 11:12:02 -0500
Subject: [PATCH 059/137] Revert forwarding calls. (5a86c01e) Instead, manually
 get from the entry.

---
 src/Structures/Page.php            |  8 +-------
 src/Structures/TreeBuilder.php     |  1 +
 tests/Data/Structures/PageTest.php | 13 -------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index a3589ec0885..345f8c5301a 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -9,14 +9,13 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Routing\UrlBuilder;
 use Illuminate\Contracts\Support\Responsable;
-use Illuminate\Support\Traits\ForwardsCalls;
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Facades\Blink;
 
 class Page implements Entry, Augmentable, Responsable
 {
-    use HasAugmentedInstance, ForwardsCalls;
+    use HasAugmentedInstance;
 
     protected $tree;
     protected $reference;
@@ -298,9 +297,4 @@ public function collection()
     {
         return Collection::findByMount($this);
     }
-
-    public function __call($method, $args)
-    {
-        return $this->forwardCallTo($this->entry(), $method, $args);
-    }
 }
diff --git a/src/Structures/TreeBuilder.php b/src/Structures/TreeBuilder.php
index 1dc597f49e0..028282f5a9f 100644
--- a/src/Structures/TreeBuilder.php
+++ b/src/Structures/TreeBuilder.php
@@ -58,6 +58,7 @@ protected function transformTreeForController($tree)
                 'url'         => $page->url(),
                 'edit_url'    => $page->editUrl(),
                 'slug'        => $page->slug(),
+                'redirect'    => $page->reference() ? $page->entry()->get('redirect') : null,
                 'collection'  => !$collection ? null : [
                     'handle' => $collection->handle(),
                     'title' => $collection->title(),
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index bd85c54146e..af571fcc6b2 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -205,17 +205,4 @@ public function slug($slug = null) { return 'four'; }
         $this->assertEveryItemIsInstanceOf(Page::class, $flattened);
         $this->assertEquals(['one', 'two', 'three', 'four'], $flattened->map->reference()->all());
     }
-
-    /** @test */
-    function it_forwards_calls_to_the_entry()
-    {
-        $entry = $this->mock(Entry::class);
-        $entry->shouldReceive('id')->andReturn('1');
-        $entry->shouldReceive('testing')->with('123')->once()->andReturn('hello');
-
-        $page = new Page;
-        $page->setEntry($entry);
-
-        $this->assertEquals('hello', $page->testing('123'));
-    }
 }

From 5d28aa8a681b105bc84e0c9b11c53f4bc6686989 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 12:06:23 -0500
Subject: [PATCH 060/137] Move nav and collection specific stuff outside into
 their respective view components

---
 resources/js/components/collections/View.vue  |  64 ++++++---
 resources/js/components/navigation/View.vue   | 126 +++++++++++++++++-
 resources/js/components/structures/Branch.vue |  48 +------
 .../js/components/structures/PageTree.vue     |  94 +++----------
 4 files changed, 190 insertions(+), 142 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index c0d7c997f81..016c4da6690 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -31,14 +31,6 @@
                         @click="cancelTreeProgress"
                     />
 
-                    <dropdown-list>
-                        <template #trigger>
-                            <button class="btn" v-text="`${__('Add Link')}`" />
-                        </template>
-                        <dropdown-item :text="__('Link to URL')" @click="linkTreePage" />
-                        <dropdown-item :text="__('Link to Entry')" @click="linkTreeEntries" />
-                    </dropdown-list>
-
                     <button
                         class="btn mx-2"
                         :class="{ 'disabled': !treeIsDirty }"
@@ -74,6 +66,7 @@
             ref="tree"
             :has-collection="true"
             :collections="[handle]"
+            :create-url="createUrl"
             :pages-url="structurePagesUrl"
             :submit-url="structureSubmitUrl"
             :max-depth="structureMaxDepth"
@@ -82,7 +75,23 @@
             @changed="markTreeDirty"
             @saved="markTreeClean"
             @canceled="markTreeClean"
-        />
+        >
+            <template #branch-icon="{ branch }">
+                <svg-icon v-if="isRedirectBranch(branch)"
+                    class="inline-block w-4 h-4 text-grey-50"
+                    name="external-link"
+                    v-tooltip="__('Redirect')" />
+            </template>
+
+            <template #branch-options="{ branch, removeBranch }">
+                <dropdown-item
+                    v-for="blueprint in blueprints"
+                    :key="blueprint.handle"
+                    @click="createEntry(blueprint.handle, branch.id)"
+                    v-text="__('New :thing', { thing: blueprint.title })" />
+                <dropdown-item :text="__('Delete')" class="warning" @click="deleteTreeBranch(branch, removeBranch)" />
+            </template>
+        </page-tree>
 
     </div>
 
@@ -162,14 +171,6 @@ export default {
             this.$refs.tree.cancel();
         },
 
-        linkTreePage() {
-            this.$refs.tree.linkPage();
-        },
-
-        linkTreeEntries() {
-            this.$refs.tree.linkToEntries();
-        },
-
         saveTree() {
             this.$refs.tree.save();
         },
@@ -188,7 +189,34 @@ export default {
             const fallback = this.canUseStructureTree ? 'tree' : 'list';
 
             return localStorage.getItem('statamic.collection-view.'+this.handle) || fallback;
-        }
+        },
+
+        deleteTreeBranch(branch, removeFromUi) {
+            // todo: use the delete "action" in a more reusable way
+            let message = 'This will remove the entry from the tree, and delete the entry itself.';
+
+            if (! confirm(message)) return;
+
+            this.$axios.post(this.actionUrl, {
+                action: 'delete',
+                context: { collection: this.handle },
+                selections: [branch.id],
+                values: {}
+            }).then(() => {
+                this.$toast.success(__('Action completed'))
+                removeFromUi();
+            })
+        },
+
+        isRedirectBranch(branch) {
+            return branch.redirect != null;
+        },
+
+        createEntry(blueprint, parent) {
+            let url = `${this.createUrl}?blueprint=${blueprint}`;
+            if (parent) url += '&parent=' + parent;
+            window.location = url;
+        },
 
     }
 
diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 1e1a0f39abd..01da64c0217 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -33,16 +33,57 @@
 
         <page-tree
             ref="tree"
-            :collections="collections"
             :has-collection="false"
             :pages-url="pagesUrl"
             :submit-url="submitUrl"
             :max-depth="maxDepth"
             :expects-root="expectsRoot"
             :site="site"
-            @changed="changed = true"
+            @edit-page="editPage"
+            @changed="changed = true; targetParent = null;"
             @saved="changed = false"
             @canceled="changed = false"
+        >
+            <template #branch-icon="{ branch }">
+                <svg-icon v-if="isEntryBranch(branch)" class="inline-block w-4 h-4 text-grey-50" name="hyperlink" v-tooltip="__('Entry link')" />
+                <svg-icon v-if="isLinkBranch(branch)" class="inline-block w-4 h-4 text-grey-50" name="external-link" v-tooltip="__('External link')" />
+                <svg-icon v-if="isTextBranch(branch)" class="inline-block w-4 h-4 text-grey-50" name="file-text" v-tooltip="__('Text')" />
+            </template>
+
+            <template #branch-options="{ branch, removeBranch, vm }">
+                <dropdown-item
+                    :text="__('Add child link to URL')"
+                    @click="linkPage(vm)" />
+                <dropdown-item
+                    :text="__('Add child link to entry')"
+                    @click="linkEntries(vm)" />
+                <dropdown-item
+                    :text="__('Remove')"
+                    class="warning"
+                    @click="remove(removeBranch)" />
+            </template>
+        </page-tree>
+
+        <page-selector
+            v-if="collections.length && $refs.tree"
+            ref="selector"
+            :site="site"
+            :collections="collections"
+            @selected="entriesSelected"
+        />
+
+        <page-editor
+            v-if="editingPage"
+            :initial-title="editingPage.page.title"
+            :initial-url="editingPage.page.url"
+            @closed="closePageEditor"
+            @submitted="updatePage"
+        />
+
+        <page-editor
+            v-if="creatingPage"
+            @closed="closePageCreator"
+            @submitted="pageCreated"
         />
 
     </div>
@@ -51,11 +92,15 @@
 
 <script>
 import PageTree from '../structures/PageTree.vue';
+import PageEditor from '../structures/PageEditor.vue';
+import PageSelector from '../structures/PageSelector.vue';
 
 export default {
 
     components: {
-        PageTree
+        PageTree,
+        PageEditor,
+        PageSelector
     },
 
     props: {
@@ -74,6 +119,9 @@ export default {
         return {
             mounted: false,
             changed: false,
+            creatingPage: false,
+            editingPage: false,
+            targetParent: null
         }
     },
 
@@ -103,12 +151,76 @@ export default {
             if (this.collections.length === 0) this.linkPage();
         },
 
-        linkPage() {
-            this.$refs.tree.linkPage();
+        linkPage(vm) {
+            this.targetParent = vm;
+            this.openPageCreator();
+        },
+
+        linkEntries(vm) {
+            this.targetParent = vm;
+            this.$refs.selector.linkExistingItem();
+        },
+
+        entriesSelected(pages) {
+            this.$refs.tree.addPages(pages, this.targetParent);
+        },
+
+        isEntryBranch(branch) {
+            return !!branch.id;
+        },
+
+        isLinkBranch(branch) {
+            return !this.isEntryBranch(branch) && branch.url;
+        },
+
+        isTextBranch(branch) {
+            return !this.isEntryBranch(branch) && !this.isLinkBranch(branch);
         },
 
-        linkEntries() {
-            this.$refs.tree.linkToEntries();
+        editPage(page, vm, store) {
+            if (page.id) {
+                window.location = page.edit_url;
+                return;
+            }
+
+            this.editingPage = { page, vm, store };
+        },
+
+        updatePage(page) {
+            this.editingPage.page.url = page.url;
+            this.editingPage.page.title = page.title;
+            this.$refs.tree.pageUpdated(this.editingPage.store);
+
+            this.editingPage = false;
+        },
+
+        closePageEditor() {
+            this.editingPage = false;
+        },
+
+        openPageCreator() {
+            this.creatingPage = true;
+        },
+
+        closePageCreator() {
+            this.creatingPage = false;
+        },
+
+        pageCreated(page) {
+            this.closePageCreator();
+            this.$refs.tree.addPages([{
+                title: page.title,
+                url: page.url,
+                children: []
+            }], this.targetParent);
+        },
+
+        remove(removeBranch) {
+            let message = 'This will only remove the references (and any children) from the tree. No entries will be deleted.';
+
+            if (! confirm(message)) return;
+
+            removeBranch();
         }
 
     }
diff --git a/resources/js/components/structures/Branch.vue b/resources/js/components/structures/Branch.vue
index 066aefb7f8a..3a758f262b7 100644
--- a/resources/js/components/structures/Branch.vue
+++ b/resources/js/components/structures/Branch.vue
@@ -8,8 +8,10 @@
             <div class="flex items-center flex-1">
                 <i v-if="isRoot" class="icon icon-home mr-1 opacity-25" />
 
-                <a v-if="!page.id" @click="edit" :class="{ 'text-sm font-medium': isTopLevel }">{{ page.title || page.url }}</a>
-                <a v-else :href="page.edit_url" :class="{ 'text-sm font-medium': isTopLevel }">{{ page.title || page.url }}</a>
+                <a
+                    @click="$emit('edit')"
+                    :class="{ 'text-sm font-medium': isTopLevel }"
+                    v-text="page.title || page.url" />
 
                 <div v-if="page.collection" class="ml-2 flex items-center">
                     <svg-icon name="content-writing" class="w-4 h-4" />
@@ -22,40 +24,21 @@
             </div>
 
             <div class="pr-1 flex items-center">
-                <svg-icon v-if="isEntry" class="inline-block w-4 h-4 text-grey-50" name="hyperlink" v-tooltip="__('Entry link')" />
-                <svg-icon v-if="isLink" class="inline-block w-4 h-4 text-grey-50" name="external-link" v-tooltip="__('External link')" />
-                <svg-icon v-if="isText" class="inline-block w-4 h-4 text-grey-50" name="file-text" v-tooltip="__('Text')" />
+                <slot name="branch-icon" :branch="page" />
 
                 <dropdown-list class="ml-2">
-                    <dropdown-item :text="__('Add child link to URL')" @click="$emit('link-page')" />
-                    <dropdown-item :text="__('Add child link to entry')" @click="$emit('link-entries')" />
-                    <dropdown-item v-if="hasCollection" :text="__('Create Entry')" @click="$emit('create-entry', page.id)" />
-                    <dropdown-item :text="__('Remove')" class="warning" @click="remove" />
+                    <slot name="branch-options" :branch="page" :remove-branch="remove" />
                 </dropdown-list>
             </div>
 
         </div>
-
-        <page-editor
-            v-if="editing"
-            :initial-title="page.title"
-            :initial-url="page.url"
-            @closed="closeEditor"
-            @submitted="updatePage"
-        />
     </div>
 
 </template>
 
 <script>
-import PageEditor from './PageEditor.vue';
-
 export default {
 
-    components: {
-        PageEditor,
-    },
-
     props: {
         page: Object,
         depth: Number,
@@ -102,28 +85,9 @@ export default {
     methods: {
 
         remove() {
-            let message = 'This will only remove the references (and any children) from the tree. No entries will be deleted.';
-
-            if (! confirm(message)) return;
-
             const store = this.page._vm.store;
             store.deleteNode(this.page);
             this.$emit('removed', store);
-        },
-
-        edit() {
-            this.editing = true;
-        },
-
-        closeEditor() {
-            this.editing = false;
-        },
-
-        updatePage(page) {
-            this.page.url = page.url;
-            this.page.title = page.title;
-            this.$emit('updated');
-            this.closeEditor();
         }
 
 
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 9666f7a2cae..b1fc6e24d3d 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -27,38 +27,27 @@
                 @drag="treeDragstart"
             >
                 <tree-branch
-                    slot-scope="{ data: page, store: tree, vm }"
+                    slot-scope="{ data: page, store, vm }"
                     :page="page"
                     :depth="vm.level"
                     :vm="vm"
                     :first-page-is-root="expectsRoot"
                     :hasCollection="hasCollection"
-                    @edit="editPage(page, vm)"
-                    @updated="pageUpdated(tree)"
+                    @edit="$emit('edit-page', page, vm, store)"
                     @removed="pageRemoved"
-                    @link-page="linkChildPage(vm)"
-                    @link-entries="linkChildEntries(vm)"
-                    @create-entry="createEntry"
-                />
+                >
+                    <template #branch-icon="props">
+                        <slot name="branch-icon" v-bind="{ ...props, vm }" />
+                    </template>
+
+                    <template #branch-options="props">
+                        <slot name="branch-options" v-bind="{ ...props, vm }" />
+                    </template>
+                </tree-branch>
             </draggable-tree>
 
         </div>
 
-        <page-selector
-            v-if="collections.length"
-            ref="selector"
-            :site="site"
-            :collections="collections"
-            :exclusions="exclusions"
-            @selected="pagesSelected"
-        />
-
-        <page-editor
-            v-if="creatingPage"
-            @closed="closePageCreator"
-            @submitted="pageCreated"
-        />
-
         <audio ref="soundDrop">
             <source :src="soundDropUrl" type="audio/mp3">
         </audio>
@@ -72,16 +61,12 @@ import * as th from 'tree-helper';
 import {Sortable, Plugins} from '@shopify/draggable';
 import {DraggableTree} from 'vue-draggable-nested-tree/dist/vue-draggable-nested-tree';
 import TreeBranch from './Branch.vue';
-import PageSelector from './PageSelector.vue';
-import PageEditor from './PageEditor.vue';
 
 export default {
 
     components: {
         DraggableTree,
         TreeBranch,
-        PageSelector,
-        PageEditor,
     },
 
     props: {
@@ -90,7 +75,6 @@ export default {
         createUrl: { type: String },
         site: { type: String, required: true },
         localizations: { type: Array },
-        collections: { type: Array, default: () => [] },
         maxDepth: { type: Number, default: Infinity, },
         expectsRoot: { type: Boolean, required: true },
         hasCollection: { type: Boolean, required: true },
@@ -104,8 +88,6 @@ export default {
             treeData: [],
             pageIds: [],
             parentPageForAdding: null,
-            targetPage: null,
-            creatingPage: false,
             soundDropUrl: this.$config.get('resourceUrl') + '/audio/click.mp3',
         }
     },
@@ -129,8 +111,11 @@ export default {
             handler(pages) {
                 this.pageIds = this.getPageIds(pages);
             }
-        }
+        },
 
+        pageIds(ids) {
+            this.$emit('page-ids-updated', ids);
+        }
     },
 
     created() {
@@ -192,12 +177,12 @@ export default {
             });
         },
 
-        pagesSelected(selections) {
-            const parent = this.parentPageForAdding
-                ? this.parentPageForAdding.data.children
+        addPages(pages, targetParent) {
+            const parent = targetParent
+                ? targetParent.data.children
                 : this.treeData;
 
-            selections.forEach(selection => {
+            pages.forEach(selection => {
                 parent.push({
                     id: selection.id,
                     title: selection.title,
@@ -208,7 +193,6 @@ export default {
                 });
             });
 
-            this.parentPageForAdding = null;
             this.treeUpdated();
         },
 
@@ -270,51 +254,11 @@ export default {
             });
         },
 
-        createEntry(parent) {
-            window.location = this.createEntryUrl(parent);
-        },
-
-        createEntryUrl(parent) {
-            let url = this.createUrl;
-            if (parent) url += '?parent=' + parent;
-            return url;
-        },
-
         linkChildPage(vm) {
             this.parentPageForAdding = vm;
             this.openPageCreator();
         },
 
-        linkChildEntries(vm) {
-            this.parentPageForAdding = vm;
-            this.linkToEntries();
-        },
-
-        linkPage() {
-            this.openPageCreator();
-        },
-
-        linkToEntries() {
-            this.$refs.selector.linkExistingItem();
-        },
-
-        openPageCreator() {
-            this.creatingPage = true;
-        },
-
-        closePageCreator() {
-            this.creatingPage = false;
-        },
-
-        pageCreated(page) {
-            this.closePageCreator();
-            this.pagesSelected([{
-                title: page.title,
-                url: page.url,
-                children: []
-            }]);
-        },
-
         pageUpdated(tree) {
             this.pages = tree.getPureData();
             this.$emit('changed');

From 704707e1b4e903b0bfd202f721d463a9cb23461d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 12:06:32 -0500
Subject: [PATCH 061/137] Use the handle, not the whole blueprint

---
 src/Entries/Collection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 608fa9f0279..429d77cefe5 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -176,7 +176,7 @@ public function entryBlueprints($blueprints = null)
         return $this
             ->fluentlyGetOrSet('blueprints')
             ->getter(function ($blueprints) {
-                $blueprints = $blueprints ?? [$this->fallbackEntryBlueprint()];
+                $blueprints = $blueprints ?? [$this->fallbackEntryBlueprint()->handle()];
 
                 if ($this->hasStructure()) {
                     $blueprints[] = 'entry_link';

From f53079f3d4716587e6576622c283b560f092e343 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 12:59:50 -0500
Subject: [PATCH 062/137] Remove the entry from the structure when its deleted.

---
 src/Entries/Entry.php                     |  6 ++
 src/Structures/Tree.php                   |  9 +++
 tests/Feature/Entries/DeleteEntryTest.php | 84 +++++++++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 tests/Feature/Entries/DeleteEntryTest.php

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index cb5ff88b519..b2a09040d22 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -123,6 +123,12 @@ public function toCacheableArray()
 
     public function delete()
     {
+        if ($this->hasStructure()) {
+            tap($this->structure(), function ($structure) {
+                $structure->trees()->each->remove($this);
+            })->save();
+        }
+
         Facades\Entry::delete($this);
 
         return true;
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 067840b99fb..0fd2c54c4e7 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -236,6 +236,15 @@ public function move($entry, $target)
         return $this->appendTo($target, $match);
     }
 
+    public function remove($entry)
+    {
+        [, $branches] = $this->removeFromInBranches($entry->id(), $this->tree);
+
+        $this->tree = $branches;
+
+        return $this;
+    }
+
     private function removeFromInBranches($entry, $branches)
     {
         $match = null;
diff --git a/tests/Feature/Entries/DeleteEntryTest.php b/tests/Feature/Entries/DeleteEntryTest.php
new file mode 100644
index 00000000000..e95a8c0be9b
--- /dev/null
+++ b/tests/Feature/Entries/DeleteEntryTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Tests\Feature\Entries;
+
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class EditEntryTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    function it_deletes_entries()
+    {
+        $user = tap(User::make('test')->makeSuper())->save();
+        EntryFactory::id('1')->slug('one')->collection('test')->create();
+        EntryFactory::id('2')->slug('two')->collection('test')->create();
+        EntryFactory::id('3')->slug('three')->collection('test')->create();
+
+        $this->assertCount(3, Entry::all());
+
+        $this
+            ->actingAs($user)
+            ->deleteEntries(['1', '3'])
+            ->assertOk();
+
+        $this->assertCount(1, Entry::all());
+        $this->assertEquals('two', Entry::all()->first()->slug());
+    }
+
+    /** @test */
+    function entries_get_removed_from_the_structure()
+    {
+        // We need to confirm that the structure actually gets saved, which would mean it becomes a new object.
+        // When using the array cache driver, the same instance would always be returned.
+        config(['cache.default' => 'file']);
+        \Illuminate\Support\Facades\Cache::clear();
+
+        $this->withoutExceptionHandling();
+        $user = tap(User::make('test')->makeSuper())->save();
+        EntryFactory::id('1')->slug('one')->collection('test')->create();
+        EntryFactory::id('2')->slug('two')->collection('test')->create();
+        EntryFactory::id('3')->slug('three')->collection('test')->create();
+
+        $collection = tap(Collection::findByHandle('test')->structureContents([
+            'tree' => [
+                ['entry' => '1'],
+                ['entry' => '2'],
+                ['entry' => '3'],
+            ]
+        ]))->save();
+        $originalStructure = $collection->structure();
+
+        $this->assertCount(3, Entry::all());
+
+        $this
+            ->actingAs($user)
+            ->deleteEntries(['1', '3'])
+            ->assertOk();
+
+        $updatedCollection = Collection::findByHandle('test');
+        $updatedStructure = $updatedCollection->structure();
+        $this->assertEquals([
+            ['entry' => '2']
+        ], $updatedStructure->in('en')->tree());
+        $this->assertNotSame($originalStructure, $updatedStructure);
+    }
+
+    function deleteEntries($ids)
+    {
+        return $this->postJson('/cp/collections/test/entries/actions', [
+            'action' => 'delete',
+            'context' => ['collection' => 'test'],
+            'selections' => $ids,
+            'values' => [],
+        ]);
+    }
+}

From f9700099bf9c07e3b21bfe6b0a02db6df78035f0 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 15:27:40 -0500
Subject: [PATCH 063/137] Separate route for updating a collection's structure.
 Entry deletion happens when you save.

---
 resources/js/components/collections/View.vue  | 32 +++++++--------
 .../js/components/structures/PageTree.vue     |  3 +-
 resources/views/collections/show.blade.php    |  2 +-
 routes/cp.php                                 |  1 +
 .../CollectionStructureController.php         | 39 +++++++++++++++++++
 5 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 src/Http/Controllers/CP/Collections/CollectionStructureController.php

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 016c4da6690..2601df24877 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -13,7 +13,7 @@
                     <slot name="twirldown" />
                 </dropdown-list>
 
-                <div class="btn-group-flat mr-2" v-if="canUseStructureTree">
+                <div class="btn-group-flat mr-2" v-if="canUseStructureTree && !treeIsDirty">
                     <button @click="view = 'tree'" :class="{'active': view === 'tree'}">
                         <svg-icon name="structures" class="h-4 w-4"/>
                     </button>
@@ -33,10 +33,11 @@
 
                     <button
                         class="btn mx-2"
-                        :class="{ 'disabled': !treeIsDirty }"
+                        :class="{ 'disabled': !treeIsDirty, 'btn-danger': deletedEntries.length }"
                         :disabled="!treeIsDirty"
                         @click="saveTree"
-                        v-text="__('Save Changes')" />
+                        v-text="__('Save Changes')"
+                        v-tooltip="deletedEntries.length ? __n('An entry will be deleted|:count entries will be deleted', deletedEntries.length) : null" />
 
                 </template>
 
@@ -69,6 +70,7 @@
             :create-url="createUrl"
             :pages-url="structurePagesUrl"
             :submit-url="structureSubmitUrl"
+            :submit-parameters="{ deletedEntries }"
             :max-depth="structureMaxDepth"
             :expects-root="structureExpectsRoot"
             :site="site"
@@ -131,6 +133,7 @@ export default {
         return {
             mounted: false,
             view: null,
+            deletedEntries: []
         }
     },
 
@@ -169,10 +172,12 @@ export default {
 
         cancelTreeProgress() {
             this.$refs.tree.cancel();
+            this.deletedEntries = [];
         },
 
         saveTree() {
             this.$refs.tree.save();
+            this.deletedEntries = [];
         },
 
         markTreeDirty() {
@@ -192,20 +197,13 @@ export default {
         },
 
         deleteTreeBranch(branch, removeFromUi) {
-            // todo: use the delete "action" in a more reusable way
-            let message = 'This will remove the entry from the tree, and delete the entry itself.';
-
-            if (! confirm(message)) return;
-
-            this.$axios.post(this.actionUrl, {
-                action: 'delete',
-                context: { collection: this.handle },
-                selections: [branch.id],
-                values: {}
-            }).then(() => {
-                this.$toast.success(__('Action completed'))
-                removeFromUi();
-            })
+            // todo: children?
+
+            const message = 'Are you sure? The entry will be deleted when you save changes.';
+            if (!confirm(message)) return;
+            this.deletedEntries.push(branch.id);
+
+            removeFromUi();
         },
 
         isRedirectBranch(branch) {
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index b1fc6e24d3d..e064b83d8c2 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -72,6 +72,7 @@ export default {
     props: {
         pagesUrl: { type: String, required: true },
         submitUrl: { type: String, required: true },
+        submitParameters: { type: Object, default: () => ({}) },
         createUrl: { type: String },
         site: { type: String, required: true },
         localizations: { type: Array },
@@ -167,7 +168,7 @@ export default {
 
         save() {
             this.saving = true;
-            const payload = { pages: this.pages, site: this.site, expectsRoot: this.expectsRoot };
+            const payload = { pages: this.pages, site: this.site, expectsRoot: this.expectsRoot, ...this.submitParameters };
 
             this.$axios.post(this.submitUrl, payload).then(response => {
                 this.$emit('saved');
diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index f4ae16f80ce..999e541a171 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -20,7 +20,7 @@
         @if ($collection->hasStructure())
         :structured="{{ Statamic\Support\Str::bool($user->can('reorder', $collection)) }}"
         structure-pages-url="{{ cp_route('structures.pages.index', $structure->handle()) }}"
-        structure-submit-url="{{ cp_route('structures.pages.store', $structure->handle()) }}"
+        structure-submit-url="{{ cp_route('collections.structure.update', $collection->handle()) }}"
         :structure-max-depth="{{ $structure->maxDepth() ?? 'Infinity' }}"
         :structure-expects-root="{{ Statamic\Support\Str::bool($structure->expectsRoot()) }}"
         @endif
diff --git a/routes/cp.php b/routes/cp.php
index 7ac1dc81f32..3a9beeae0f0 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -33,6 +33,7 @@
 
     Route::group(['namespace' => 'Collections'], function () {
         Route::resource('collections', 'CollectionsController');
+        Route::post('collections/{collection}/structure', 'CollectionStructureController@update')->name('collections.structure.update');
         Route::get('collections/{collection}/scaffold', 'ScaffoldCollectionController@index')->name('collections.scaffold');
         Route::post('collections/{collection}/scaffold', 'ScaffoldCollectionController@create')->name('collections.scaffold.create');
 
diff --git a/src/Http/Controllers/CP/Collections/CollectionStructureController.php b/src/Http/Controllers/CP/Collections/CollectionStructureController.php
new file mode 100644
index 00000000000..915abbd6773
--- /dev/null
+++ b/src/Http/Controllers/CP/Collections/CollectionStructureController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Collections;
+
+use Illuminate\Http\Request;
+use Statamic\Facades\Entry;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Support\Arr;
+
+class CollectionStructureController extends CpController
+{
+    public function update(Request $request, $collection)
+    {
+        $tree = $this->toTree($request->pages);
+
+        collect($request->deletedEntries ?? [])
+            ->map(function ($id) {
+                Entry::find($id)->delete();
+            });
+
+        $collection
+            ->structure()
+            ->in($request->site)
+            ->tree($tree)
+            ->save();
+    }
+
+    protected function toTree($items)
+    {
+        return collect($items)->map(function ($item) {
+            return Arr::removeNullValues([
+                'entry' => $ref = $item['id'] ?? null,
+                'title' => $ref ? null : ($item['title'] ?? null),
+                'url' => $ref ? null : ($item['url'] ?? null),
+                'children' => $this->toTree($item['children'])
+            ]);
+        })->all();
+    }
+}

From d83e2b6e001ee6e03fed05880220fde923c46837 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 15:53:56 -0500
Subject: [PATCH 064/137] Tests for f9700099 and add authorization

---
 .../CollectionStructureController.php         |   2 +
 .../UpdateCollectionStructureTest.php         | 111 ++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 tests/Feature/Collections/UpdateCollectionStructureTest.php

diff --git a/src/Http/Controllers/CP/Collections/CollectionStructureController.php b/src/Http/Controllers/CP/Collections/CollectionStructureController.php
index 915abbd6773..ae7ffdaad54 100644
--- a/src/Http/Controllers/CP/Collections/CollectionStructureController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionStructureController.php
@@ -11,6 +11,8 @@ class CollectionStructureController extends CpController
 {
     public function update(Request $request, $collection)
     {
+        $this->authorize('reorder', $collection);
+
         $tree = $this->toTree($request->pages);
 
         collect($request->deletedEntries ?? [])
diff --git a/tests/Feature/Collections/UpdateCollectionStructureTest.php b/tests/Feature/Collections/UpdateCollectionStructureTest.php
new file mode 100644
index 00000000000..f4c17ad10e8
--- /dev/null
+++ b/tests/Feature/Collections/UpdateCollectionStructureTest.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Tests\Feature\Collections;
+
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UpdateCollectionStructureTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+    use FakesRoles;
+
+    /** @test */
+    function it_updates_the_tree()
+    {
+        $user = tap(User::make()->makeSuper())->save();
+        $collection = tap(Collection::make('test'))->save();
+        EntryFactory::id('1')->collection($collection)->create();
+        EntryFactory::id('2')->collection($collection)->create();
+        EntryFactory::id('3')->collection($collection)->create();
+        EntryFactory::id('4')->collection($collection)->create();
+        EntryFactory::id('5')->collection($collection)->create();
+        $collection->structureContents(['tree' => [
+            ['entry' => '1'],
+            ['entry' => '2'],
+            ['entry' => '3'],
+            ['entry' => '4'],
+            ['entry' => '5'],
+        ]])->save();
+
+        $this
+            ->actingAs($user)
+            ->update($collection, ['pages' => [
+                ['id' => '3', 'children' => [
+                    ['id' => '5', 'children' => [
+                        ['id' => '4', 'children' => []]
+                    ]]
+                ]],
+                ['id' => '1', 'children' => []],
+                ['id' => '2', 'children' => []],
+            ]])
+            ->assertOk();
+
+        $this->assertEquals([
+            ['entry' => '3', 'children' => [
+                ['entry' => '5', 'children' => [
+                    ['entry' => '4']
+                ]]
+            ]],
+            ['entry' => '1'],
+            ['entry' => '2'],
+        ], $collection->structure()->in('en')->tree());
+    }
+
+    /** @test */
+    function it_deletes_entries_scheduled_for_deletion()
+    {
+        $user = tap(User::make()->makeSuper())->save();
+        $collection = tap(Collection::make('test'))->save();
+        EntryFactory::id('1')->collection($collection)->create();
+        EntryFactory::id('2')->collection($collection)->create();
+        EntryFactory::id('3')->collection($collection)->create();
+        $collection->structureContents(['tree' => []])->save();
+        $this->assertCount(3, Entry::all());
+
+        $this
+            ->actingAs($user)
+            ->update($collection, ['deletedEntries' => ['1', '3']])
+            ->assertOk();
+
+        $this->assertCount(1, Entry::all());
+    }
+
+    /** @test */
+    function it_denies_access_if_you_dont_have_permission_to_reorder()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test')->structureContents(['tree' => []]))->save();
+
+        $this
+            ->actingAs($user)
+            ->update($collection, ['site' => 'en', 'pages' => []])
+            ->assertForbidden();
+    }
+
+    function update($collection, $payload = [])
+    {
+        $validParams = [
+            'site' => 'en',
+            'pages' => [],
+            'deletedEntries' => []
+        ];
+
+        return $this->postJson(
+            cp_route('collections.structure.update', $collection->handle()),
+            array_merge($validParams, $payload)
+        );
+    }
+
+    /** @test */
+    function it_updates_a_specific_sites_tree()
+    {
+        $this->markTestIncomplete();
+    }
+}

From e97c3327d2b8cac283caf3b90836fd681ad7925e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 15:57:34 -0500
Subject: [PATCH 065/137] Fix class

---
 tests/Feature/Entries/DeleteEntryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/Entries/DeleteEntryTest.php b/tests/Feature/Entries/DeleteEntryTest.php
index e95a8c0be9b..9f54b9c64de 100644
--- a/tests/Feature/Entries/DeleteEntryTest.php
+++ b/tests/Feature/Entries/DeleteEntryTest.php
@@ -10,7 +10,7 @@
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
-class EditEntryTest extends TestCase
+class DeleteEntryTest extends TestCase
 {
     use FakesRoles;
     use PreventSavingStacheItemsToDisk;

From cfa7960ac1b20009f35998f9a1ba1551b462fb22 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 5 Mar 2020 16:04:50 -0500
Subject: [PATCH 066/137] Needs a collection in here now

---
 tests/Data/Entries/EntryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 0467a6afccc..5b077787247 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -659,7 +659,7 @@ function it_gets_and_sets_the_id()
     function it_deletes_through_the_api()
     {
         Event::fake();
-        $entry = new Entry;
+        $entry = (new Entry)->collection(tap(Collection::make('test'))->save());
         Facades\Entry::shouldReceive('delete')->with($entry);
 
         $return = $entry->delete();

From 9afb03c62acff35d671f076120938543741b383f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 12:31:04 -0500
Subject: [PATCH 067/137] Option to delete or orphan child entries when
 deleting an entry.

---
 .../collections/DeleteEntryConfirmation.vue   | 38 ++++++++++++++++
 resources/js/components/collections/View.vue  | 45 ++++++++++++++-----
 resources/js/components/structures/Branch.vue | 22 ++++++++-
 .../js/components/structures/PageTree.vue     |  6 +++
 4 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 resources/js/components/collections/DeleteEntryConfirmation.vue

diff --git a/resources/js/components/collections/DeleteEntryConfirmation.vue b/resources/js/components/collections/DeleteEntryConfirmation.vue
new file mode 100644
index 00000000000..34ee1b5ce4f
--- /dev/null
+++ b/resources/js/components/collections/DeleteEntryConfirmation.vue
@@ -0,0 +1,38 @@
+<template>
+
+    <modal name="delete-entry-confirmation" :pivotY="0.1" :overflow="false">
+        <div class="confirmation-modal flex flex-col h-full">
+            <div class="text-lg font-medium p-2 pb-0">
+                {{ __('Delete Entry') }}
+            </div>
+            <div class="flex-1 px-2 py-3 text-grey">
+                <p class="mb-2">Are you sure you want to delete this entry?</p>
+                <label class="flex items-center">
+                    <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+                    Delete child pages
+                </label>
+            </div>
+            <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+                <button class="text-grey hover:text-grey-90"
+                    @click="$emit('cancel')"
+                    v-text="__('Cancel')" />
+                <button class="btn ml-2 btn-danger"
+                    @click="$emit('confirm', shouldDeleteChildren)"
+                    v-text="__('Delete')" />
+            </div>
+        </div>
+    </modal>
+
+</template>
+
+<script>
+export default {
+
+    data() {
+        return {
+            shouldDeleteChildren: false
+        }
+    }
+
+}
+</script>
diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 2601df24877..31aadef6722 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -85,27 +85,38 @@
                     v-tooltip="__('Redirect')" />
             </template>
 
-            <template #branch-options="{ branch, removeBranch }">
+            <template #branch-options="{ branch, removeBranch, orphanChildren }">
                 <dropdown-item
                     v-for="blueprint in blueprints"
                     :key="blueprint.handle"
                     @click="createEntry(blueprint.handle, branch.id)"
                     v-text="__('New :thing', { thing: blueprint.title })" />
-                <dropdown-item :text="__('Delete')" class="warning" @click="deleteTreeBranch(branch, removeBranch)" />
+                <dropdown-item
+                    :text="__('Delete')"
+                    class="warning"
+                    @click="deleteTreeBranch(branch, removeBranch, orphanChildren)" />
             </template>
         </page-tree>
 
+        <delete-entry-confirmation
+            v-if="showEntryDeletionConfirmation"
+            @confirm="entryDeletionConfirmCallback"
+            @cancel="showEntryDeletionConfirmation = false"
+        />
+
     </div>
 
 </template>
 
 <script>
 import PageTree from '../structures/PageTree.vue';
+import DeleteEntryConfirmation from './DeleteEntryConfirmation.vue';
 
 export default {
 
     components: {
         PageTree,
+        DeleteEntryConfirmation
     },
 
     props: {
@@ -133,7 +144,9 @@ export default {
         return {
             mounted: false,
             view: null,
-            deletedEntries: []
+            deletedEntries: [],
+            showEntryDeletionConfirmation: false,
+            entryDeletionConfirmCallback: null,
         }
     },
 
@@ -196,14 +209,24 @@ export default {
             return localStorage.getItem('statamic.collection-view.'+this.handle) || fallback;
         },
 
-        deleteTreeBranch(branch, removeFromUi) {
-            // todo: children?
-
-            const message = 'Are you sure? The entry will be deleted when you save changes.';
-            if (!confirm(message)) return;
-            this.deletedEntries.push(branch.id);
-
-            removeFromUi();
+        deleteTreeBranch(branch, removeFromUi, orphanChildren) {
+            this.showEntryDeletionConfirmation = true;
+            this.entryDeletionConfirmCallback = (shouldDeleteChildren) => {
+                this.deletedEntries.push(branch.id);
+                if (shouldDeleteChildren) {
+                    const addDeletableChildren = (branch) => {
+                        branch.children.forEach(child => {
+                            this.deletedEntries.push(child.id);
+                            addDeletableChildren(child);
+                        });
+                    };
+                    addDeletableChildren(branch);
+                } else {
+                    orphanChildren();
+                }
+                removeFromUi();
+                this.showEntryDeletionConfirmation = false;
+            }
         },
 
         isRedirectBranch(branch) {
diff --git a/resources/js/components/structures/Branch.vue b/resources/js/components/structures/Branch.vue
index 3a758f262b7..43544b02054 100644
--- a/resources/js/components/structures/Branch.vue
+++ b/resources/js/components/structures/Branch.vue
@@ -27,7 +27,11 @@
                 <slot name="branch-icon" :branch="page" />
 
                 <dropdown-list class="ml-2">
-                    <slot name="branch-options" :branch="page" :remove-branch="remove" />
+                    <slot name="branch-options"
+                        :branch="page"
+                        :remove-branch="remove"
+                        :orphan-children="orphanChildren"
+                    />
                 </dropdown-list>
             </div>
 
@@ -37,6 +41,8 @@
 </template>
 
 <script>
+import * as th from 'tree-helper';
+
 export default {
 
     props: {
@@ -88,8 +94,20 @@ export default {
             const store = this.page._vm.store;
             store.deleteNode(this.page);
             this.$emit('removed', store);
-        }
+        },
 
+        orphanChildren() {
+            const store = this.page._vm.store;
+            let children = this.vm.data.children;
+            let length = children.length;
+            for (let index = 0; index < length; index++) {
+                // As the item is moved out, the rest of the items are moved up an index.
+                // We always just want to move the first item.
+                th.appendTo(children[0], store.rootData);
+            }
+
+            this.$emit('children-orphaned', store);
+        }
 
     }
 
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index e064b83d8c2..36efa80b03b 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -35,6 +35,7 @@
                     :hasCollection="hasCollection"
                     @edit="$emit('edit-page', page, vm, store)"
                     @removed="pageRemoved"
+                    @children-orphaned="childrenOrphaned"
                 >
                     <template #branch-icon="props">
                         <slot name="branch-icon" v-bind="{ ...props, vm }" />
@@ -206,6 +207,11 @@ export default {
             this.$emit('changed');
         },
 
+        childrenOrphaned(tree) {
+            this.pages = tree.getPureData();
+            this.$emit('changed');
+        },
+
         localizationSelected(localization) {
             if (localization.active) return;
 

From 3c4e597f7f6f828cd2c81b3f81974728002f2b8a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 12:34:24 -0500
Subject: [PATCH 068/137] Extract to a method to tidy it up

---
 resources/js/components/collections/View.vue | 23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 31aadef6722..fb34174ba1e 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -213,22 +213,23 @@ export default {
             this.showEntryDeletionConfirmation = true;
             this.entryDeletionConfirmCallback = (shouldDeleteChildren) => {
                 this.deletedEntries.push(branch.id);
-                if (shouldDeleteChildren) {
-                    const addDeletableChildren = (branch) => {
-                        branch.children.forEach(child => {
-                            this.deletedEntries.push(child.id);
-                            addDeletableChildren(child);
-                        });
-                    };
-                    addDeletableChildren(branch);
-                } else {
-                    orphanChildren();
-                }
+                shouldDeleteChildren ? this.markEntriesForDeletion(branch) : orphanChildren();
                 removeFromUi();
                 this.showEntryDeletionConfirmation = false;
             }
         },
 
+        markEntriesForDeletion(branch) {
+            const addDeletableChildren = (branch) => {
+                branch.children.forEach(child => {
+                    this.deletedEntries.push(child.id);
+                    addDeletableChildren(child);
+                });
+            };
+
+            addDeletableChildren(branch);
+        },
+
         isRedirectBranch(branch) {
             return branch.redirect != null;
         },

From be95b88bcc5def2e248e548ff106a3b074943ad7 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 13:01:44 -0500
Subject: [PATCH 069/137] When deleting an entry, its child pages should be
 moved to the top level, and their structure should be maintained.

---
 src/Entries/Entry.php                     |  8 +++++++-
 src/Structures/Tree.php                   |  8 ++++++--
 tests/Feature/Entries/DeleteEntryTest.php | 20 ++++++++++++++++----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index b2a09040d22..5f80b0eb3cf 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -125,7 +125,13 @@ public function delete()
     {
         if ($this->hasStructure()) {
             tap($this->structure(), function ($structure) {
-                $structure->trees()->each->remove($this);
+                $structure->trees()->each(function ($tree) {
+                    // Ugly, but it's moving all the child pages to the top level. TODO: Tidy.
+                    $this->page()->pages()->all()->each(function ($child) use ($tree) {
+                        $tree->move($child->id(), null);
+                    });
+                    $tree->remove($this);
+                });
             })->save();
         }
 
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 0fd2c54c4e7..6a246b692ef 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -187,7 +187,7 @@ public function append($entry)
 
     public function appendTo($parent, $page)
     {
-        if (! $this->page($parent)) {
+        if ($parent && !$this->page($parent)) {
             throw new \Exception("Page [{$parent}] does not exist in this structure");
         }
 
@@ -197,7 +197,11 @@ public function appendTo($parent, $page)
             $page = ['entry' => $page->id()];
         }
 
-        $this->tree = $this->appendToInBranches($parent, $page, $this->tree);
+        if ($parent) {
+            $this->tree = $this->appendToInBranches($parent, $page, $this->tree);
+        } else {
+            $this->tree[] = $page;
+        }
 
         return $this;
     }
diff --git a/tests/Feature/Entries/DeleteEntryTest.php b/tests/Feature/Entries/DeleteEntryTest.php
index 9f54b9c64de..214c78d3481 100644
--- a/tests/Feature/Entries/DeleteEntryTest.php
+++ b/tests/Feature/Entries/DeleteEntryTest.php
@@ -35,7 +35,7 @@ function it_deletes_entries()
     }
 
     /** @test */
-    function entries_get_removed_from_the_structure()
+    function entries_get_removed_from_the_structure_and_child_pages_are_moved_to_the_top()
     {
         // We need to confirm that the structure actually gets saved, which would mean it becomes a new object.
         // When using the array cache driver, the same instance would always be returned.
@@ -47,17 +47,25 @@ function entries_get_removed_from_the_structure()
         EntryFactory::id('1')->slug('one')->collection('test')->create();
         EntryFactory::id('2')->slug('two')->collection('test')->create();
         EntryFactory::id('3')->slug('three')->collection('test')->create();
+        EntryFactory::id('4')->slug('four')->collection('test')->create();
+        EntryFactory::id('5')->slug('five')->collection('test')->create();
+        EntryFactory::id('6')->slug('six')->collection('test')->create();
 
         $collection = tap(Collection::findByHandle('test')->structureContents([
             'tree' => [
-                ['entry' => '1'],
+                ['entry' => '1', 'children' => [
+                    ['entry' => '4'],
+                    ['entry' => '5', 'children' => [
+                        ['entry' => '6']
+                    ]],
+                ]],
                 ['entry' => '2'],
                 ['entry' => '3'],
             ]
         ]))->save();
         $originalStructure = $collection->structure();
 
-        $this->assertCount(3, Entry::all());
+        $this->assertCount(6, Entry::all());
 
         $this
             ->actingAs($user)
@@ -67,7 +75,11 @@ function entries_get_removed_from_the_structure()
         $updatedCollection = Collection::findByHandle('test');
         $updatedStructure = $updatedCollection->structure();
         $this->assertEquals([
-            ['entry' => '2']
+            ['entry' => '2'],
+            ['entry' => '4'],
+            ['entry' => '5', 'children' => [
+                ['entry' => '6']
+            ]],
         ], $updatedStructure->in('en')->tree());
         $this->assertNotSame($originalStructure, $updatedStructure);
     }

From a85557be407717386c7bb077049baf798987ccda Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 13:02:44 -0500
Subject: [PATCH 070/137] Use v-if so changing views triggers fresh data ...

Simplest way to solve when you perform an action in the listing, like deleting an entry, for the tree to be updated - and vice versa.
---
 resources/js/components/collections/View.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index fb34174ba1e..17726bc2988 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -50,7 +50,7 @@
         </header>
 
         <entry-list
-            v-show="view === 'list'"
+            v-if="view === 'list'"
             :collection="handle"
             :initial-sort-column="sortColumn"
             :initial-sort-direction="sortDirection"
@@ -62,8 +62,7 @@
         />
 
         <page-tree
-            v-if="canUseStructureTree"
-            v-show="view === 'tree'"
+            v-if="canUseStructureTree && view === 'tree'"
             ref="tree"
             :has-collection="true"
             :collections="[handle]"

From d74cfc8fb791d51c2b9bc311f21f484a4220ebf3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 15:06:49 -0500
Subject: [PATCH 071/137] Adjust messaging for the number of children

---
 .../collections/DeleteEntryConfirmation.vue    |  8 ++++++--
 resources/js/components/collections/View.vue   | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/collections/DeleteEntryConfirmation.vue b/resources/js/components/collections/DeleteEntryConfirmation.vue
index 34ee1b5ce4f..24efd215b6a 100644
--- a/resources/js/components/collections/DeleteEntryConfirmation.vue
+++ b/resources/js/components/collections/DeleteEntryConfirmation.vue
@@ -7,9 +7,9 @@
             </div>
             <div class="flex-1 px-2 py-3 text-grey">
                 <p class="mb-2">Are you sure you want to delete this entry?</p>
-                <label class="flex items-center">
+                <label class="flex items-center" v-if="children">
                     <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
-                    Delete child pages
+                    {{ __n('Delete child entry|Delete :count child entries', children) }}
                 </label>
             </div>
             <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
@@ -28,6 +28,10 @@
 <script>
 export default {
 
+    props: {
+        children: Number
+    },
+
     data() {
         return {
             shouldDeleteChildren: false
diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 17726bc2988..2068c13f702 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -99,8 +99,9 @@
 
         <delete-entry-confirmation
             v-if="showEntryDeletionConfirmation"
+            :children="numberOfChildrenToBeDeleted"
             @confirm="entryDeletionConfirmCallback"
-            @cancel="showEntryDeletionConfirmation = false"
+            @cancel="showEntryDeletionConfirmation = false; entryBeingDeleted = null;"
         />
 
     </div>
@@ -145,6 +146,7 @@ export default {
             view: null,
             deletedEntries: [],
             showEntryDeletionConfirmation: false,
+            entryBeingDeleted: null,
             entryDeletionConfirmCallback: null,
         }
     },
@@ -163,6 +165,18 @@ export default {
             return this.structured && this.structureMaxDepth === 1;
         },
 
+        numberOfChildrenToBeDeleted() {
+            let children = 0;
+            const countChildren = (entry) => {
+                entry.children.forEach(child => {
+                    children++;
+                    countChildren(child);
+                });
+            }
+            countChildren(this.entryBeingDeleted);
+            return children;
+        }
+
     },
 
     watch: {
@@ -210,11 +224,13 @@ export default {
 
         deleteTreeBranch(branch, removeFromUi, orphanChildren) {
             this.showEntryDeletionConfirmation = true;
+            this.entryBeingDeleted = branch;
             this.entryDeletionConfirmCallback = (shouldDeleteChildren) => {
                 this.deletedEntries.push(branch.id);
                 shouldDeleteChildren ? this.markEntriesForDeletion(branch) : orphanChildren();
                 removeFromUi();
                 this.showEntryDeletionConfirmation = false;
+                this.entryBeingDeleted = false;
             }
         },
 

From 04798c9140fbe251c06d4684850f7af4ae096191 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 15:23:04 -0500
Subject: [PATCH 072/137] Add remove page confirmation to navs

---
 .../navigation/RemovePageConfirmation.vue     | 43 ++++++++++++++++
 resources/js/components/navigation/View.vue   | 49 ++++++++++++++-----
 2 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 resources/js/components/navigation/RemovePageConfirmation.vue

diff --git a/resources/js/components/navigation/RemovePageConfirmation.vue b/resources/js/components/navigation/RemovePageConfirmation.vue
new file mode 100644
index 00000000000..f9d8e5e2628
--- /dev/null
+++ b/resources/js/components/navigation/RemovePageConfirmation.vue
@@ -0,0 +1,43 @@
+<template>
+
+    <modal name="remove-page-confirmation" :pivotY="0.1" :overflow="false">
+        <div class="confirmation-modal flex flex-col h-full">
+            <div class="text-lg font-medium p-2 pb-0">
+                {{ __('Remove Page') }}
+            </div>
+            <div class="flex-1 px-2 py-3 text-grey">
+                <p class="mb-2">Are you sure you want to remove this page?</p>
+                <p class="mb-2">Only the references will be removed. Entries will not be deleted.</p>
+                <label class="flex items-center" v-if="children">
+                    <input type="checkbox" class="mr-1" v-model="shouldDeleteChildren" />
+                    {{ __n('Remove child page|Remove :count child pages', children) }}
+                </label>
+            </div>
+            <div class="p-2 bg-grey-20 border-t flex items-center justify-end text-sm">
+                <button class="text-grey hover:text-grey-90"
+                    @click="$emit('cancel')"
+                    v-text="__('Cancel')" />
+                <button class="btn ml-2 btn-danger"
+                    @click="$emit('confirm', shouldDeleteChildren)"
+                    v-text="__('Remove')" />
+            </div>
+        </div>
+    </modal>
+
+</template>
+
+<script>
+export default {
+
+    props: {
+        children: Number
+    },
+
+    data() {
+        return {
+            shouldDeleteChildren: false
+        }
+    }
+
+}
+</script>
diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 01da64c0217..28bfb6362d6 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -50,7 +50,7 @@
                 <svg-icon v-if="isTextBranch(branch)" class="inline-block w-4 h-4 text-grey-50" name="file-text" v-tooltip="__('Text')" />
             </template>
 
-            <template #branch-options="{ branch, removeBranch, vm }">
+            <template #branch-options="{ branch, removeBranch, orphanChildren, vm }">
                 <dropdown-item
                     :text="__('Add child link to URL')"
                     @click="linkPage(vm)" />
@@ -60,7 +60,7 @@
                 <dropdown-item
                     :text="__('Remove')"
                     class="warning"
-                    @click="remove(removeBranch)" />
+                    @click="deleteTreeBranch(branch, removeBranch, orphanChildren)" />
             </template>
         </page-tree>
 
@@ -86,6 +86,13 @@
             @submitted="pageCreated"
         />
 
+        <remove-page-confirmation
+            v-if="showPageDeletionConfirmation"
+            :children="numberOfChildrenToBeDeleted"
+            @confirm="pageDeletionConfirmCallback"
+            @cancel="showPageDeletionConfirmation = false; pageBeingDeleted = null;"
+        />
+
     </div>
 
 </template>
@@ -94,13 +101,15 @@
 import PageTree from '../structures/PageTree.vue';
 import PageEditor from '../structures/PageEditor.vue';
 import PageSelector from '../structures/PageSelector.vue';
+import RemovePageConfirmation from './RemovePageConfirmation.vue';
 
 export default {
 
     components: {
         PageTree,
         PageEditor,
-        PageSelector
+        PageSelector,
+        RemovePageConfirmation
     },
 
     props: {
@@ -121,7 +130,10 @@ export default {
             changed: false,
             creatingPage: false,
             editingPage: false,
-            targetParent: null
+            targetParent: null,
+            showPageDeletionConfirmation: false,
+            pageBeingDeleted: null,
+            pageDeletionConfirmCallback: null,
         }
     },
 
@@ -129,6 +141,18 @@ export default {
 
         isDirty() {
             return this.$dirty.has('page-tree');
+        },
+
+        numberOfChildrenToBeDeleted() {
+            let children = 0;
+            const countChildren = (page) => {
+                page.children.forEach(child => {
+                    children++;
+                    countChildren(child);
+                });
+            }
+            countChildren(this.pageBeingDeleted);
+            return children;
         }
 
     },
@@ -215,13 +239,16 @@ export default {
             }], this.targetParent);
         },
 
-        remove(removeBranch) {
-            let message = 'This will only remove the references (and any children) from the tree. No entries will be deleted.';
-
-            if (! confirm(message)) return;
-
-            removeBranch();
-        }
+        deleteTreeBranch(branch, removeFromUi, orphanChildren) {
+            this.showPageDeletionConfirmation = true;
+            this.pageBeingDeleted = branch;
+            this.pageDeletionConfirmCallback = (shouldDeleteChildren) => {
+                if (!shouldDeleteChildren) orphanChildren();
+                removeFromUi();
+                this.showPageDeletionConfirmation = false;
+                this.pageBeingDeleted = branch;
+            }
+        },
 
     }
 

From 245376f78ffec8eed882b3e39d9cae3dffcb3094 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 15:51:54 -0500
Subject: [PATCH 073/137] Orphaned pages go to the parent instead of all the
 way to the top (with caveat) ...

The comments in the test explain the caveat.
---
 resources/js/components/structures/Branch.vue |  2 +-
 src/Entries/Entry.php                         | 10 ++-
 tests/Feature/Entries/DeleteEntryTest.php     | 61 ++++++++++++++++---
 3 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/resources/js/components/structures/Branch.vue b/resources/js/components/structures/Branch.vue
index 43544b02054..2e36343687c 100644
--- a/resources/js/components/structures/Branch.vue
+++ b/resources/js/components/structures/Branch.vue
@@ -103,7 +103,7 @@ export default {
             for (let index = 0; index < length; index++) {
                 // As the item is moved out, the rest of the items are moved up an index.
                 // We always just want to move the first item.
-                th.appendTo(children[0], store.rootData);
+                th.appendTo(children[0], this.vm.data.parent);
             }
 
             this.$emit('children-orphaned', store);
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 5f80b0eb3cf..173470e06db 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -126,9 +126,13 @@ public function delete()
         if ($this->hasStructure()) {
             tap($this->structure(), function ($structure) {
                 $structure->trees()->each(function ($tree) {
-                    // Ugly, but it's moving all the child pages to the top level. TODO: Tidy.
-                    $this->page()->pages()->all()->each(function ($child) use ($tree) {
-                        $tree->move($child->id(), null);
+                    // Ugly, but it's moving all the child pages to the parent. TODO: Tidy.
+                    $parent = $this->parent();
+                    if (optional($parent)->isRoot()) {
+                        $parent = null;
+                    }
+                    $this->page()->pages()->all()->each(function ($child) use ($tree, $parent) {
+                        $tree->move($child->id(), optional($parent)->id());
                     });
                     $tree->remove($this);
                 });
diff --git a/tests/Feature/Entries/DeleteEntryTest.php b/tests/Feature/Entries/DeleteEntryTest.php
index 214c78d3481..3cfe0371bfe 100644
--- a/tests/Feature/Entries/DeleteEntryTest.php
+++ b/tests/Feature/Entries/DeleteEntryTest.php
@@ -35,7 +35,7 @@ function it_deletes_entries()
     }
 
     /** @test */
-    function entries_get_removed_from_the_structure_and_child_pages_are_moved_to_the_top()
+    function entries_get_removed_from_the_structure_and_child_pages_are_moved_to_the_parent()
     {
         // We need to confirm that the structure actually gets saved, which would mean it becomes a new object.
         // When using the array cache driver, the same instance would always be returned.
@@ -50,6 +50,9 @@ function entries_get_removed_from_the_structure_and_child_pages_are_moved_to_the
         EntryFactory::id('4')->slug('four')->collection('test')->create();
         EntryFactory::id('5')->slug('five')->collection('test')->create();
         EntryFactory::id('6')->slug('six')->collection('test')->create();
+        EntryFactory::id('7')->slug('six')->collection('test')->create();
+        EntryFactory::id('8')->slug('six')->collection('test')->create();
+        EntryFactory::id('9')->slug('six')->collection('test')->create();
 
         $collection = tap(Collection::findByHandle('test')->structureContents([
             'tree' => [
@@ -60,30 +63,70 @@ function entries_get_removed_from_the_structure_and_child_pages_are_moved_to_the
                     ]],
                 ]],
                 ['entry' => '2'],
-                ['entry' => '3'],
+                ['entry' => '3', 'children' => [
+                    ['entry' => '7', 'children' => [
+                        ['entry' => '8', 'children' => [
+                            ['entry' => '9']
+                        ]],
+                    ]]
+                ]],
             ]
         ]))->save();
         $originalStructure = $collection->structure();
 
-        $this->assertCount(6, Entry::all());
+        $this->assertCount(9, Entry::all());
 
         $this
             ->actingAs($user)
-            ->deleteEntries(['1', '3'])
+            ->deleteEntries(['1', '2', '7'])
             ->assertOk();
 
         $updatedCollection = Collection::findByHandle('test');
         $updatedStructure = $updatedCollection->structure();
+        $updatedTree = $updatedStructure->in('en')->tree();
+
+        // TODO: Ideally, the order would be maintained and the assertion in the following test could
+        // go right here and pass.
+        //
+        // However, it's currently rearranging the tree items as the entries are deleted, in the order
+        // they are submitted. These assertions are proving that the items are *structured* correctly
+        // (ie. they'd result in the same urls, minus the parent slug) but not necessarily in the same order.
+        $this->assertEquals(['entry' => '4'], collect($updatedTree)->first(fn($item) => $item['entry'] == '4'));
         $this->assertEquals([
-            ['entry' => '2'],
-            ['entry' => '4'],
-            ['entry' => '5', 'children' => [
+            'entry' => '3', 'children' => [
+                ['entry' => '8', 'children' => [
+                    ['entry' => '9']
+                ]]
+            ]
+        ], collect($updatedTree)->first(fn($item) => $item['entry'] == '3'));
+        $this->assertEquals([
+            'entry' => '5', 'children' => [
                 ['entry' => '6']
-            ]],
-        ], $updatedStructure->in('en')->tree());
+            ]
+        ], collect($updatedTree)->first(fn($item) => $item['entry'] == '5'));
+
         $this->assertNotSame($originalStructure, $updatedStructure);
     }
 
+    /** @test */
+    function entries_get_removed_from_the_structure_and_child_pages_are_moved_to_the_parent_and_maintain_order()
+    {
+        // TODO: This is a reminder that the previous test needs to have the following assertion swapped in.
+        $this->markTestIncomplete();
+
+        // $this->assertEquals([
+        //     ['entry' => '4'],
+        //     ['entry' => '5', 'children' => [
+        //         ['entry' => '6']
+        //     ]],
+        //     ['entry' => '3', 'children' => [
+        //         ['entry' => '8', 'children' => [
+        //             ['entry' => '9']
+        //         ]],
+        //     ]],
+        // ], $updatedTree);
+    }
+
     function deleteEntries($ids)
     {
         return $this->postJson('/cp/collections/test/entries/actions', [

From 9aa3e54b931f4c9969c1415cb5d77137e008cb97 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 6 Mar 2020 15:56:09 -0500
Subject: [PATCH 074/137] no fancy pee haetch pees

---
 tests/Feature/Entries/DeleteEntryTest.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/Feature/Entries/DeleteEntryTest.php b/tests/Feature/Entries/DeleteEntryTest.php
index 3cfe0371bfe..8bc3180f209 100644
--- a/tests/Feature/Entries/DeleteEntryTest.php
+++ b/tests/Feature/Entries/DeleteEntryTest.php
@@ -91,19 +91,27 @@ function entries_get_removed_from_the_structure_and_child_pages_are_moved_to_the
         // However, it's currently rearranging the tree items as the entries are deleted, in the order
         // they are submitted. These assertions are proving that the items are *structured* correctly
         // (ie. they'd result in the same urls, minus the parent slug) but not necessarily in the same order.
-        $this->assertEquals(['entry' => '4'], collect($updatedTree)->first(fn($item) => $item['entry'] == '4'));
+        $this->assertEquals(['entry' => '4'], collect($updatedTree)->first(function ($item) {
+            return $item['entry'] == '4';
+        }));
+
         $this->assertEquals([
             'entry' => '3', 'children' => [
                 ['entry' => '8', 'children' => [
                     ['entry' => '9']
                 ]]
             ]
-        ], collect($updatedTree)->first(fn($item) => $item['entry'] == '3'));
+        ], collect($updatedTree)->first(function ($item) {
+            return $item['entry'] == '3';
+        }));
+
         $this->assertEquals([
             'entry' => '5', 'children' => [
                 ['entry' => '6']
             ]
-        ], collect($updatedTree)->first(fn($item) => $item['entry'] == '5'));
+        ], collect($updatedTree)->first(function ($item) {
+            return $item['entry'] == '5';
+        }));
 
         $this->assertNotSame($originalStructure, $updatedStructure);
     }

From c3d046e95da18670fae4402f027915e418de2e25 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 13:37:56 -0400
Subject: [PATCH 075/137] Update structure when an entry is deleted by hand ...

As part of the stache watcher, allow handling of deleted items.

Replace the collection's structure with a new class. We grab the structureContents and manipulate that because if we were to do $collection->structure() it would try to new up the structure based on its contents (which now has a deleted entry) and would throw a validation error.

A temporary anonymous structure class is used so we can create a tree not tied to a collection (and thus bypassing validation) for the sole purpose of using the $tree->remove() method, to remove the deleted entry reference. The tree class already has a bunch of smarts to do that.
---
 src/Stache/Stores/CollectionEntriesStore.php | 68 ++++++++++++++++----
 src/Stache/Stores/Store.php                  |  6 ++
 src/Structures/Tree.php                      |  4 +-
 3 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/src/Stache/Stores/CollectionEntriesStore.php b/src/Stache/Stores/CollectionEntriesStore.php
index 0c84656c4c7..fd937d6dbff 100644
--- a/src/Stache/Stores/CollectionEntriesStore.php
+++ b/src/Stache/Stores/CollectionEntriesStore.php
@@ -10,6 +10,7 @@
 use Statamic\Stache\Indexes;
 use Symfony\Component\Finder\SplFileInfo;
 use Statamic\Entries\GetDateFromPath;
+use Statamic\Structures\CollectionStructure;
 
 class CollectionEntriesStore extends ChildStore
 {
@@ -30,18 +31,7 @@ public function getFileFilter(SplFileInfo $file) {
 
     public function makeItemFromFile($path, $contents)
     {
-        $site = Site::default()->handle();
-        $collection = pathinfo($path, PATHINFO_DIRNAME);
-        $collection = str_after($collection, $this->parent->directory());
-
-        if (Site::hasMultiple()) {
-            list($collection, $site) = explode('/', $collection);
-        }
-
-        // Support entries within subdirectories at any level.
-        if (str_contains($collection, '/')) {
-            $collection = str_before($collection, '/');
-        }
+        [$collection, $site] = $this->extractAttributesFromPath($path);
 
         $data = YAML::file($path)->parse($contents);
 
@@ -87,11 +77,65 @@ public function makeItemFromFile($path, $contents)
         return $entry;
     }
 
+    protected function extractAttributesFromPath($path)
+    {
+        $site = Site::default()->handle();
+        $collection = pathinfo($path, PATHINFO_DIRNAME);
+        $collection = str_after($collection, $this->parent->directory());
+
+        if (Site::hasMultiple()) {
+            list($collection, $site) = explode('/', $collection);
+        }
+
+        // Support entries within subdirectories at any level.
+        if (str_contains($collection, '/')) {
+            $collection = str_before($collection, '/');
+        }
+
+        return [$collection, $site];
+    }
+
     protected function handleModifiedItem($item)
     {
         $item->taxonomize();
     }
 
+    protected function handleDeletedItem($path, $id)
+    {
+        [$collection, $site] = $this->extractAttributesFromPath($path);
+
+        $collection = Collection::findByHandle($collection);
+
+        $this->removeEntryFromStructure($collection, $id);
+    }
+
+    protected function removeEntryFromStructure($collection, $id)
+    {
+        if (! $collection->hasStructure()) {
+            return;
+        }
+
+        $contents = $collection->structureContents();
+
+        $trees = $contents['trees'] ?? [Site::default()->handle() => $contents['tree']];
+        unset($contents['tree']);
+        $contents['trees'] = $trees;
+
+        $structure = (new CollectionStructure)->collection($collection);
+
+        $tempStructure = new class extends \Statamic\Structures\Structure {
+            public function collections($collections = null) { return collect(); }
+        };
+
+        foreach ($trees as $site => $treeContents) {
+            $tempTree = $tempStructure->makeTree($site);
+            $tempTree->tree($treeContents)->remove($id);
+            $structure->addTree($tempTree);
+        }
+
+        $collection->structure($structure)->save();
+    }
+
     protected function storeIndexes()
     {
         $indexes = collect([
diff --git a/src/Stache/Stores/Store.php b/src/Stache/Stores/Store.php
index c1ceb012fa1..b3a5a4ebbb1 100644
--- a/src/Stache/Stores/Store.php
+++ b/src/Stache/Stores/Store.php
@@ -216,6 +216,7 @@ public function handleFileChanges()
         $deleted->each(function ($path) {
             if ($key = $this->getKeyFromPath($path)) {
                 $this->forgetItem($key);
+                $this->handleDeletedItem($path, $key);
             }
         });
 
@@ -273,6 +274,11 @@ protected function handleModifiedItem($item)
         //
     }
 
+    protected function handleDeletedItem($item, $key)
+    {
+        //
+    }
+
     protected function adjustModifiedPaths($paths)
     {
         return $paths;
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 6a246b692ef..9f1bd83a629 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -242,7 +242,9 @@ public function move($entry, $target)
 
     public function remove($entry)
     {
-        [, $branches] = $this->removeFromInBranches($entry->id(), $this->tree);
+        $id = is_string($entry) ? $entry : $entry->id();
+
+        [, $branches] = $this->removeFromInBranches($id, $this->tree);
 
         $this->tree = $branches;
 

From e65037bf70272bb2463ddf2e2160ab6dc2d0db70 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 13:39:41 -0400
Subject: [PATCH 076/137] Remove temp var

---
 src/Stache/Stores/CollectionEntriesStore.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Stache/Stores/CollectionEntriesStore.php b/src/Stache/Stores/CollectionEntriesStore.php
index fd937d6dbff..c5c9266da74 100644
--- a/src/Stache/Stores/CollectionEntriesStore.php
+++ b/src/Stache/Stores/CollectionEntriesStore.php
@@ -128,9 +128,9 @@ public function collections($collections = null) { return collect(); }
         };
 
         foreach ($trees as $site => $treeContents) {
-            $tempTree = $tempStructure->makeTree($site);
-            $tempTree->tree($treeContents)->remove($id);
-            $structure->addTree($tempTree);
+            $structure->addTree(
+                $tempStructure->makeTree($site)->tree($treeContents)->remove($id)
+            );
         }
 
         $collection->structure($structure)->save();

From 38ca9d9b1402c91d04bf0f46a479a789c75cb327 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 15:55:15 -0400
Subject: [PATCH 077/137] Fix editing of branches

---
 resources/js/components/collections/View.vue | 5 +++++
 resources/js/components/navigation/View.vue  | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 2068c13f702..2edba37adea 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -73,6 +73,7 @@
             :max-depth="structureMaxDepth"
             :expects-root="structureExpectsRoot"
             :site="site"
+            @edit-page="editPage"
             @changed="markTreeDirty"
             @saved="markTreeClean"
             @canceled="markTreeClean"
@@ -255,6 +256,10 @@ export default {
             window.location = url;
         },
 
+        editPage(page, vm, store) {
+            window.location = page.edit_url;
+        }
+
     }
 
 }
diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 28bfb6362d6..df1c7c11341 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -202,11 +202,6 @@ export default {
         },
 
         editPage(page, vm, store) {
-            if (page.id) {
-                window.location = page.edit_url;
-                return;
-            }
-
             this.editingPage = { page, vm, store };
         },
 

From 24365b7e2144f65f8024efbc1e336901d9716b9a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 15:56:46 -0400
Subject: [PATCH 078/137] Revert the revert (c3db4109) and allow forwarding
 calls to the entry again

---
 src/Structures/Page.php            |  8 +++++++-
 tests/Data/Structures/PageTest.php | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index 345f8c5301a..a3589ec0885 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -9,13 +9,14 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\Routing\UrlBuilder;
 use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Support\Traits\ForwardsCalls;
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Facades\Blink;
 
 class Page implements Entry, Augmentable, Responsable
 {
-    use HasAugmentedInstance;
+    use HasAugmentedInstance, ForwardsCalls;
 
     protected $tree;
     protected $reference;
@@ -297,4 +298,9 @@ public function collection()
     {
         return Collection::findByMount($this);
     }
+
+    public function __call($method, $args)
+    {
+        return $this->forwardCallTo($this->entry(), $method, $args);
+    }
 }
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index af571fcc6b2..bd85c54146e 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -205,4 +205,17 @@ public function slug($slug = null) { return 'four'; }
         $this->assertEveryItemIsInstanceOf(Page::class, $flattened);
         $this->assertEquals(['one', 'two', 'three', 'four'], $flattened->map->reference()->all());
     }
+
+    /** @test */
+    function it_forwards_calls_to_the_entry()
+    {
+        $entry = $this->mock(Entry::class);
+        $entry->shouldReceive('id')->andReturn('1');
+        $entry->shouldReceive('testing')->with('123')->once()->andReturn('hello');
+
+        $page = new Page;
+        $page->setEntry($entry);
+
+        $this->assertEquals('hello', $page->testing('123'));
+    }
 }

From 74b2f77fc5e45eb5128ef28d5bc507bc9f0fba53 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 15:57:24 -0400
Subject: [PATCH 079/137] URL handling on routable/entries for redirects

---
 src/Routing/Routable.php         | 28 ++++++++++++++++++++++++++++
 tests/Data/Entries/EntryTest.php | 10 ++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/Routing/Routable.php b/src/Routing/Routable.php
index 09b616e0769..13771ce5b70 100644
--- a/src/Routing/Routable.php
+++ b/src/Routing/Routable.php
@@ -22,6 +22,10 @@ public function slug($slug = null)
 
     public function uri()
     {
+        if ($this->isRedirect()) {
+            return null;
+        }
+
         if (! $route = $this->route()) {
             return null;
         }
@@ -31,19 +35,43 @@ public function uri()
 
     public function url()
     {
+        if ($this->isRedirect()) {
+            return $this->redirectUrl();
+        }
+
         return URL::makeRelative($this->absoluteUrl());
     }
 
     public function absoluteUrl()
     {
+        if ($this->isRedirect()) {
+            return $this->redirectUrl();
+        }
+
         return vsprintf('%s/%s', [
             rtrim($this->site()->absoluteUrl(), '/'),
             ltrim($this->uri(), '/')
         ]);
     }
 
+    public function isRedirect()
+    {
+        return (bool) $this->value('redirect');
+    }
+
+    public function redirectUrl()
+    {
+        if ($redirect = $this->value('redirect')) {
+            return (new \Statamic\Routing\ResolveRedirect)($redirect);
+        }
+    }
+
     public function ampUrl()
     {
+        if ($this->isRedirect()) {
+            return null;
+        }
+
         return !$this->ampable() ? null : vsprintf('%s/%s/%s', [
             rtrim($this->site()->absoluteUrl(), '/'),
             config('statamic.amp.route'),
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 5b077787247..e478bd3081d 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -213,21 +213,31 @@ function it_gets_the_url_from_the_collection()
         $entryEn = (new Entry)->collection($collection)->locale('en')->slug('foo');
         $entryFr = (new Entry)->collection($collection)->locale('fr')->slug('le-foo');
         $entryDe = (new Entry)->collection($collection)->locale('de')->slug('das-foo');
+        $redirectEntry = (new Entry)->collection($collection)->locale('en')->slug('redirected')->set('redirect', 'http://example.com/page');
 
         $this->assertEquals('/blog/foo', $entryEn->uri());
         $this->assertEquals('/blog/foo', $entryEn->url());
         $this->assertEquals('http://domain.com/blog/foo', $entryEn->absoluteUrl());
         $this->assertEquals('http://domain.com/amp/blog/foo', $entryEn->ampUrl());
+        $this->assertNull($entryEn->redirectUrl());
 
         $this->assertEquals('/le-blog/le-foo', $entryFr->uri());
         $this->assertEquals('/fr/le-blog/le-foo', $entryFr->url());
         $this->assertEquals('http://domain.com/fr/le-blog/le-foo', $entryFr->absoluteUrl());
         $this->assertEquals('http://domain.com/fr/amp/le-blog/le-foo', $entryFr->ampUrl());
+        $this->assertNull($entryFr->redirectUrl());
 
         $this->assertEquals('/das-blog/das-foo', $entryDe->uri());
         $this->assertEquals('/das-blog/das-foo', $entryDe->url());
         $this->assertEquals('http://domain.de/das-blog/das-foo', $entryDe->absoluteUrl());
         $this->assertEquals('http://domain.de/amp/das-blog/das-foo', $entryDe->ampUrl());
+        $this->assertNull($entryDe->redirectUrl());
+
+        $this->assertNull($redirectEntry->uri());
+        $this->assertEquals('http://example.com/page', $redirectEntry->url());
+        $this->assertEquals('http://example.com/page', $redirectEntry->absoluteUrl());
+        $this->assertNull($redirectEntry->ampUrl());
+        $this->assertEquals('http://example.com/page', $redirectEntry->redirectUrl());
     }
 
     /** @test */

From 7bb6959c4e58fb7ea6c546b936b3668b58eaf60c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 15:57:34 -0400
Subject: [PATCH 080/137] Redirect handling on pages

---
 src/Structures/Page.php            | 12 ++++++++++
 tests/Data/Structures/PageTest.php | 38 +++++++++++++++++++++++-------
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index a3589ec0885..0b26d7ffb2b 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -41,6 +41,10 @@ public function url()
             return $this->url;
         }
 
+        if ($this->isRedirect()) {
+            return $this->redirectUrl();
+        }
+
         if ($this->reference && $this->referenceExists()) {
             return URL::makeRelative($this->absoluteUrl());
         }
@@ -147,6 +151,10 @@ public function uri()
             return optional($this->parent)->uri();
         }
 
+        if ($this->isRedirect()) {
+            return null;
+        }
+
         $uris = app(UriCache::class);
 
         if ($cached = $uris[$this->reference] ?? null) {
@@ -178,6 +186,10 @@ public function absoluteUrl()
             return $this->url;
         }
 
+        if ($this->isRedirect()) {
+            return $this->redirectUrl();
+        }
+
         if ($this->reference && $this->referenceExists()) {
             return vsprintf('%s/%s', [
                 rtrim($this->site()->absoluteUrl(), '/'),
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index bd85c54146e..51356f021b8 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -109,14 +109,11 @@ public function slug($slug = null) {
     /** @test */
     function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collection()
     {
-        $entry = new class extends Entry {
-            public function id($id = null) {
-                return 'a';
-            }
-            public function uri() {
-                return '/the/actual/entry/uri';
-            }
-        };
+        $entry = $this->partialMock(Entry::class);
+        $entry->shouldReceive('id')->andReturn('test');
+        $entry->shouldReceive('locale')->andReturn('en');
+        $entry->shouldReceive('uri')->andReturn('/the/actual/entry/uri');
+        $entry->shouldReceive('value')->with('redirect')->andReturnNull();
 
         $tree = (new Tree)->structure(
             $this->mock(Nav::class)
@@ -127,6 +124,31 @@ public function uri() {
             ->setEntry($entry);
 
         $this->assertEquals('/the/actual/entry/uri', $page->uri());
+        $this->assertEquals('/the/actual/entry/uri', $page->url());
+        $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
+        $this->assertFalse($page->isRedirect());
+    }
+
+    /** @test */
+    function it_gets_the_uri_of_a_redirect_entry()
+    {
+        $entry = $this->partialMock(Entry::class);
+        $entry->shouldReceive('id')->andReturn('test');
+        $entry->shouldReceive('locale')->andReturn('en');
+        $entry->shouldReceive('value')->with('redirect')->andReturn('http://example.com/page');
+
+        $tree = (new Tree)->structure(
+            $this->mock(Nav::class)
+        );
+
+        $page = (new Page)
+            ->setTree($tree)
+            ->setEntry($entry);
+
+        $this->assertNull($page->uri());
+        $this->assertEquals('http://example.com/page', $page->url());
+        $this->assertEquals('http://example.com/page', $page->absoluteUrl());
+        $this->assertTrue($page->isRedirect());
     }
 
     /** @test */

From 54e2dbb2b1d86d850c885b901320a1f7a30a7bbd Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 15:57:46 -0400
Subject: [PATCH 081/137] Populate root and max depth

---
 src/Stache/Stores/CollectionEntriesStore.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Stache/Stores/CollectionEntriesStore.php b/src/Stache/Stores/CollectionEntriesStore.php
index c5c9266da74..a1c4dc92a47 100644
--- a/src/Stache/Stores/CollectionEntriesStore.php
+++ b/src/Stache/Stores/CollectionEntriesStore.php
@@ -121,7 +121,10 @@ protected function removeEntryFromStructure($collection, $id)
         unset($contents['tree']);
         $contents['trees'] = $trees;
 
-        $structure = (new CollectionStructure)->collection($collection);
+        $structure = (new CollectionStructure)
+            ->collection($collection)
+            ->expectsRoot($contents['root'] ?? false)
+            ->maxDepth($contents['max_depth'] ?? null);
 
         $tempStructure = new class extends \Statamic\Structures\Structure {
             public function collections($collections = null) { return collect(); }

From d28b6f3c7ced3b4b40e132f595f3852d14e5e06f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 9 Mar 2020 17:22:59 -0400
Subject: [PATCH 082/137] Collection tag will filter out links/redirects by
 default and provides a param to allow them

---
 src/Tags/Collection/Entries.php          | 16 +++++++++
 tests/Tags/Collection/CollectionTest.php | 41 +++++++++++++++++++-----
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/Tags/Collection/Entries.php b/src/Tags/Collection/Entries.php
index 72e237eddc3..d9faaa6a44a 100644
--- a/src/Tags/Collection/Entries.php
+++ b/src/Tags/Collection/Entries.php
@@ -145,6 +145,7 @@ protected function query()
         $this->queryPastFuture($query);
         $this->querySinceUntil($query);
         $this->queryTaxonomies($query);
+        $this->queryRedirects($query);
         $this->queryConditions($query);
         $this->queryScopes($query);
         $this->queryOrderBys($query);
@@ -331,4 +332,19 @@ protected function queryOrderBys($query)
 
         return $this->traitQueryOrderBys($query);
     }
+
+    protected function queryRedirects($query)
+    {
+        $isQueryingRedirect = $this->parameters->first(function ($v, $k) {
+            return Str::startsWith($k, 'redirect:');
+        });
+
+        if ($isQueryingRedirect) {
+            return;
+        }
+
+        if (! $this->parameters->bool(['redirects', 'links'], false)) {
+            $query->where('redirect', '=', null);
+        }
+    }
 }
diff --git a/tests/Tags/Collection/CollectionTest.php b/tests/Tags/Collection/CollectionTest.php
index 931f50fc588..dfdc71edb20 100644
--- a/tests/Tags/Collection/CollectionTest.php
+++ b/tests/Tags/Collection/CollectionTest.php
@@ -2,19 +2,20 @@
 
 namespace Tests\Tags\Collection;
 
+use Facades\Tests\Factories\EntryFactory;
+use Illuminate\Support\Carbon;
+use Statamic\Exceptions\CollectionNotFoundException;
 use Statamic\Facades;
-use Tests\TestCase;
 use Statamic\Facades\Antlers;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Entry;
+use Statamic\Structures\CollectionStructure;
+use Statamic\Tags\Collection\Collection;
+use Statamic\Tags\Collection\Entries;
 use Statamic\Tags\Context;
 use Statamic\Tags\Parameters;
-use Illuminate\Support\Carbon;
-use Statamic\Tags\Collection\Entries;
-use Statamic\Tags\Collection\Collection;
-use Facades\Tests\Factories\EntryFactory;
 use Tests\PreventSavingStacheItemsToDisk;
-use Statamic\Exceptions\CollectionNotFoundException;
-use Statamic\Facades\Blueprint;
-use Statamic\Structures\CollectionStructure;
+use Tests\TestCase;
 
 class CollectionTest extends TestCase
 {
@@ -193,6 +194,30 @@ function it_gets_entries_from_all_collections_excluding_some_with_params()
         $this->assertCount(2, $this->collectionTag->index());
     }
 
+    /** @test */
+    function it_filters_out_redirects()
+    {
+        $this->makePosts();
+        Entry::find('c')->set('redirect', 'http://example.com')->save();
+        Entry::find('d')->set('redirect', 'http://example.com')->save();
+
+        // Redirects get filtered out by default.
+        $this->setTagParameters(['collection' => '*']);
+        $this->assertCount(7, $this->collectionTag->index());
+
+        // Marking as true will include them.
+        $this->setTagParameters(['collection' => '*', 'redirects' => true]);
+        $this->assertCount(9, $this->collectionTag->index());
+
+        // Aliased to links
+        $this->setTagParameters(['collection' => '*', 'links' => true]);
+        $this->assertCount(9, $this->collectionTag->index());
+
+        // Shorthand param doesn't exist to get *only* redirects. Users can do it manually with a condition.
+        $this->setTagParameters(['collection' => '*', 'redirect:exists' => true]);
+        $this->assertCount(2, $this->collectionTag->index());
+    }
+
     /** @test */
     function it_counts_entries_in_a_collection()
     {

From a6f04e32672efe9499edc55686897fba149e13b1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 10:08:53 -0400
Subject: [PATCH 083/137] Make isRedirect work for non entries

---
 src/Structures/Page.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index 0b26d7ffb2b..f1c5e3b14c4 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -50,6 +50,11 @@ public function url()
         }
     }
 
+    public function isRedirect()
+    {
+        return optional($this->entry())->isRedirect();
+    }
+
     public function setDepth($depth)
     {
         $this->depth = $depth;

From 2e263cc79c38885a6be4a9c612d3673613e4a625 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 10:09:02 -0400
Subject: [PATCH 084/137] Adjust path

---
 src/Structures/Tree.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 9f1bd83a629..59a9d99371e 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -64,7 +64,7 @@ public function route()
     public function path()
     {
         return vsprintf('%s/%s/%s.yaml', [
-            rtrim(Stache::store('structures')->directory(), '/'),
+            rtrim(Stache::store('navigation')->directory(), '/'),
             $this->locale(),
             $this->handle()
         ]);

From 60b8d73c9980d6099fb07914d64ded370cbdc194 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 11:24:01 -0400
Subject: [PATCH 085/137] Root doesnt need to be set on the tree anymore

---
 src/Stache/Stores/NavigationStore.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Stache/Stores/NavigationStore.php b/src/Stache/Stores/NavigationStore.php
index ba7912278a1..39a536363fe 100644
--- a/src/Stache/Stores/NavigationStore.php
+++ b/src/Stache/Stores/NavigationStore.php
@@ -99,7 +99,6 @@ protected function makeTree($structure, $site)
 
         return $tree
             ->initialPath($path)
-            ->root($data['root'] ?? null)
             ->tree($data['tree'] ?? []);
     }
 

From ce71554c730fd18f6c0721bdf1bac35a5c45ecf9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 11:24:23 -0400
Subject: [PATCH 086/137] The sites now just come from whether the files exist.
 No need for a variable.

---
 src/Stache/Stores/NavigationStore.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Stache/Stores/NavigationStore.php b/src/Stache/Stores/NavigationStore.php
index 39a536363fe..72c0b234df6 100644
--- a/src/Stache/Stores/NavigationStore.php
+++ b/src/Stache/Stores/NavigationStore.php
@@ -66,6 +66,10 @@ protected function makeMultiSiteStructureFromFile($handle, $path, $data)
     {
         $structure = $this->makeBaseStructureFromFile($handle, $path, $data);
 
+        $structure->sites(Site::all()->filter(function ($site) use ($handle) {
+            return File::exists($this->directory . $site->handle() . '/' . $handle . '.yaml');
+        })->map->handle()->values()->all());
+
         $structure->sites()->map(function ($site) use ($structure) {
             return $this->makeTree($structure, $site);
         })->filter()->each(function ($variables) use ($structure) {
@@ -80,7 +84,6 @@ protected function makeBaseStructureFromFile($handle, $path, $data)
         return Facades\Nav::make()
             ->handle($handle)
             ->title($data['title'] ?? null)
-            ->sites($data['sites'] ?? null)
             ->maxDepth($data['max_depth'] ?? null)
             ->collections($data['collections'] ?? null)
             ->expectsRoot($data['root'] ?? false)

From 02054973fd470c9bf907e1055b5afd4817c8c205 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 11:25:36 -0400
Subject: [PATCH 087/137] The key is tree, regardless of whether it's
 multisite. If its a single site, assume that the tree is inline. For
 multisite, its a level deeper keyed by site handles.

---
 src/Entries/Collection.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 429d77cefe5..d9713c893de 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -486,8 +486,11 @@ protected function makeStructureFromContents()
             ->expectsRoot($this->structureContents['root'] ?? false)
             ->maxDepth($this->structureContents['max_depth'] ?? null);
 
-        $trees = $this->structureContents['trees']
-            ?? [Site::default()->handle() => $this->structureContents['tree']];
+        $trees = $this->structureContents['tree'];
+
+        if (! Site::hasMultiple()) {
+            $trees = [Site::default()->handle() => $trees];
+        }
 
         foreach ($trees as $site => $contents) {
             $tree = $structure->makeTree($site)->tree($contents);

From ec3a3dcf75998f0328ba71a69a73d37c04950e9a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 11:25:56 -0400
Subject: [PATCH 088/137] Update multisite command to handle updated nav
 location

---
 src/Console/Commands/Multisite.php | 39 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/Console/Commands/Multisite.php b/src/Console/Commands/Multisite.php
index 8b9112dc914..39162fe041a 100644
--- a/src/Console/Commands/Multisite.php
+++ b/src/Console/Commands/Multisite.php
@@ -2,17 +2,17 @@
 
 namespace Statamic\Console\Commands;
 
-use Statamic\Facades\File;
-use Statamic\Facades\Site;
-use Statamic\Facades\YAML;
-use Statamic\Facades\Stache;
 use Illuminate\Console\Command;
-use Statamic\Facades\GlobalSet;
-use Statamic\Facades\Structure;
-use Statamic\Facades\Collection;
-use Statamic\Console\RunsInPlease;
 use Illuminate\Support\Facades\Cache;
 use Statamic\Console\EnhancesCommands;
+use Statamic\Console\RunsInPlease;
+use Statamic\Facades\Collection;
+use Statamic\Facades\File;
+use Statamic\Facades\GlobalSet;
+use Statamic\Facades\Nav;
+use Statamic\Facades\Site;
+use Statamic\Facades\Stache;
+use Statamic\Facades\YAML;
 use Symfony\Component\VarExporter\VarExporter;
 
 class Multisite extends Command
@@ -55,9 +55,9 @@ public function handle()
             $this->checkLine("Global [<comment>{$set->handle()}</comment>] updated.");
         });
 
-        Structure::all()->each(function ($structure) {
-            $this->moveStructure($structure);
-            $this->checkLine("Structure [<comment>{$structure->handle()}</comment>] updated.");
+        Nav::all()->each(function ($nav) {
+            $this->moveNav($nav);
+            $this->checkLine("Nav [<comment>{$nav->handle()}</comment>] updated.");
         });
 
         Cache::clear();
@@ -115,16 +115,15 @@ protected function moveGlobalSet($set)
             ->save();
     }
 
-    protected function moveStructure($structure)
+    protected function moveNav($nav)
     {
-        $yaml = YAML::file($structure->path())->parse();
+        $yaml = YAML::file($nav->path())->parse();
         $tree = $yaml['tree'] ?? [];
-        $root = $yaml['root'] ?? null;
 
-        $structure
+        $nav
             ->sites([$this->siteOne, $this->siteTwo])
-            ->addTree($structure->makeTree($this->siteOne)->tree($tree)->root($root))
-            ->addTree($structure->makeTree($this->siteTwo)->tree($tree)->root($root))
+            ->addTree($nav->makeTree($this->siteOne)->tree($tree))
+            ->addTree($nav->makeTree($this->siteTwo)->tree($tree))
             ->save();
     }
 
@@ -143,7 +142,7 @@ protected function commandMayHaveBeenRan()
     {
         return $this->collectionsHaveBeenMoved()
             || $this->globalsHaveBeenMoved()
-            || $this->structuresHaveBeenMoved();
+            || $this->navsHaveBeenMoved();
     }
 
     protected function collectionsHaveBeenMoved()
@@ -160,8 +159,8 @@ protected function globalsHaveBeenMoved()
         return File::isDirectory("content/globals/{$this->siteOne}");
     }
 
-    protected function structuresHaveBeenMoved()
+    protected function navsHaveBeenMoved()
     {
-        return File::isDirectory("content/structures/{$this->siteOne}");
+        return File::isDirectory("content/navigation/{$this->siteOne}");
     }
 }

From d6c03fbc662ebb302debfc020e23ce3d88f4736b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 11:35:35 -0400
Subject: [PATCH 089/137] Params should have been on showUrl, not editUrl

---
 src/Structures/Nav.php            | 12 ++++++------
 src/Structures/Structure.php      |  4 ++--
 tests/Data/Structures/NavTest.php |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Structures/Nav.php b/src/Structures/Nav.php
index 5d68dec6f55..586fc17a478 100644
--- a/src/Structures/Nav.php
+++ b/src/Structures/Nav.php
@@ -67,16 +67,16 @@ public function collections($collections = null)
             ->args(func_get_args());
     }
 
-    public function showUrl()
+    public function showUrl($params = [])
     {
-        return cp_route('navigation.show', $this->handle());
+        return cp_route('navigation.show', array_merge($params, [
+            'navigation' => $this->handle()
+        ]));
     }
 
-    public function editUrl($params = [])
+    public function editUrl()
     {
-        return cp_route('navigation.edit', array_merge($params, [
-            'navigation' => $this->handle()
-        ]));
+        return cp_route('navigation.edit', $this->handle());
     }
 
     public function deleteUrl()
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index 5f7788b1db8..fdc8b168247 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -134,12 +134,12 @@ public function route(string $site): ?string
         return null;
     }
 
-    public function showUrl()
+    public function showUrl($params = [])
     {
         //
     }
 
-    public function editUrl($params = [])
+    public function editUrl()
     {
         //
     }
diff --git a/tests/Data/Structures/NavTest.php b/tests/Data/Structures/NavTest.php
index 3921f5f000a..548f0c467fd 100644
--- a/tests/Data/Structures/NavTest.php
+++ b/tests/Data/Structures/NavTest.php
@@ -90,6 +90,7 @@ function it_has_cp_urls()
         $nav = $this->structure('test');
 
         $this->assertEquals('http://localhost/cp/navigation/test', $nav->showUrl());
+        $this->assertEquals('http://localhost/cp/navigation/test?foo=bar', $nav->showUrl(['foo' => 'bar']));
         $this->assertEquals('http://localhost/cp/navigation/test/edit', $nav->editUrl());
         $this->assertEquals('http://localhost/cp/navigation/test', $nav->deleteUrl());
     }

From 97d47d6e69f7d2b35d85f727c70c029ee5566edf Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 11:36:04 -0400
Subject: [PATCH 090/137] Site selector for navs

---
 .../js/components/navigation/SiteSelector.vue | 32 +++++++++++++++++++
 resources/js/components/navigation/View.vue   | 15 ++++++++-
 .../js/components/structures/PageTree.vue     |  2 +-
 resources/views/navigation/show.blade.php     |  1 +
 .../CP/Structures/NavigationController.php    | 13 ++------
 5 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 resources/js/components/navigation/SiteSelector.vue

diff --git a/resources/js/components/navigation/SiteSelector.vue b/resources/js/components/navigation/SiteSelector.vue
new file mode 100644
index 00000000000..d9ae1fc7140
--- /dev/null
+++ b/resources/js/components/navigation/SiteSelector.vue
@@ -0,0 +1,32 @@
+<template>
+
+    <v-select
+        class="mr-2 text-sm"
+        :value="site"
+        :clearable="false"
+        :searchable="false"
+        :get-option-label="site => site.name"
+        :options="sites"
+        @input="$emit('input', $event)"
+    />
+
+</template>
+
+<script>
+export default {
+
+    props: {
+        sites: { type: Array, required: true },
+        value: { type: String, required: true },
+    },
+
+    computed: {
+
+        site() {
+            return _.findWhere(this.sites, { handle: this.value });
+        }
+
+    }
+
+}
+</script>
diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index df1c7c11341..3786d0cda83 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -14,6 +14,12 @@
 
                 <a @click="$refs.tree.cancel" class="text-2xs text-blue mr-2 underline" v-if="isDirty" v-text="__('Discard changes')" />
 
+                <site-selector
+                    :sites="sites"
+                    :value="site"
+                    @input="siteSelected"
+                />
+
                 <dropdown-list :show-dropdown-if="collections.length > 0">
                     <template #trigger>
                         <button class="btn" v-text="__('Add Link')" @click="addLink" />
@@ -102,6 +108,7 @@ import PageTree from '../structures/PageTree.vue';
 import PageEditor from '../structures/PageEditor.vue';
 import PageSelector from '../structures/PageSelector.vue';
 import RemovePageConfirmation from './RemovePageConfirmation.vue';
+import SiteSelector from './SiteSelector.vue';
 
 export default {
 
@@ -109,7 +116,8 @@ export default {
         PageTree,
         PageEditor,
         PageSelector,
-        RemovePageConfirmation
+        RemovePageConfirmation,
+        SiteSelector
     },
 
     props: {
@@ -122,6 +130,7 @@ export default {
         maxDepth: { type: Number, default: Infinity, },
         expectsRoot: { type: Boolean, required: true },
         site: { type: String, required: true },
+        sites: { type: Array, required: true }
     },
 
     data() {
@@ -245,6 +254,10 @@ export default {
             }
         },
 
+        siteSelected(site) {
+            window.location = site.url;
+        }
+
     }
 
 }
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 36efa80b03b..cb187ba58b1 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -135,7 +135,7 @@ export default {
 
         getPages() {
             this.loading = true;
-            const url = this.pagesUrl;
+            const url = `${this.pagesUrl}?site=${this.site}`;
 
             return this.$axios.get(url).then(response => {
                 this.pages = response.data.pages;
diff --git a/resources/views/navigation/show.blade.php b/resources/views/navigation/show.blade.php
index 4178fea326f..a643efee39f 100644
--- a/resources/views/navigation/show.blade.php
+++ b/resources/views/navigation/show.blade.php
@@ -11,6 +11,7 @@
         submit-url="{{ cp_route('structures.pages.store', $nav->handle()) }}"
         edit-url="{{ $nav->editUrl() }}"
         site="{{ $site }}"
+        :sites="{{ json_encode($sites) }}"
         :collections="{{ json_encode($collections) }}"
         :max-depth="{{ $nav->maxDepth() ?? 'Infinity' }}"
         :expects-root="{{ $str::bool($expectsRoot) }}"
diff --git a/src/Http/Controllers/CP/Structures/NavigationController.php b/src/Http/Controllers/CP/Structures/NavigationController.php
index 8b4b492c24c..eb9bf5f002e 100644
--- a/src/Http/Controllers/CP/Structures/NavigationController.php
+++ b/src/Http/Controllers/CP/Structures/NavigationController.php
@@ -90,20 +90,13 @@ public function show(Request $request, $nav)
             'nav' => $nav,
             'expectsRoot' => $nav->expectsRoot(),
             'collections' => $nav->collections()->map->handle()->all(),
-            'localizations' => $nav->sites()->map(function ($handle) use ($nav, $tree) {
-                $localized = $nav->in($handle);
-                $exists = $localized !== null;
-                if (!$exists) {
-                    return null;
-                }
+            'sites' => $nav->sites()->map(function ($handle) use ($nav) {
                 return [
                     'handle' => $handle,
                     'name' => Site::get($handle)->name(),
-                    'active' => $handle === $tree->locale(),
-                    'exists' => $exists,
-                    'url' => $exists ? $localized->editUrl() : null,
+                    'url' => $nav->in($handle)->showUrl(),
                 ];
-            })->filter()->all()
+            })->all()
         ]);
     }
 

From 2205da9b5fd6fafd68919b9cc981b59588c1238b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 12:10:55 -0400
Subject: [PATCH 091/137] Remove unnecessary stuff

---
 resources/js/components/collections/EditForm.vue | 6 +-----
 resources/views/collections/edit.blade.php       | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/resources/js/components/collections/EditForm.vue b/resources/js/components/collections/EditForm.vue
index f809eb51229..31484b3b50e 100644
--- a/resources/js/components/collections/EditForm.vue
+++ b/resources/js/components/collections/EditForm.vue
@@ -33,14 +33,11 @@ export default {
         blueprint: Object,
         initialValues: Object,
         meta: Object,
-        initialTitle: String,
-        url: String,
-        listingUrl: String,
+        url: String
     },
 
     data() {
         return {
-            title: this.initialTitle,
             values: this.initialValues,
             error: null,
             errors: {},
@@ -60,7 +57,6 @@ export default {
 
             this.$axios.patch(this.url, this.values).then(response => {
                 this.saving = false;
-                this.title = response.data.title;
                 this.$toast.success(__('Saved'));
                 this.$refs.container.saved();
             }).catch(e => this.handleAxiosError(e));
diff --git a/resources/views/collections/edit.blade.php b/resources/views/collections/edit.blade.php
index f8c160f211d..c041bbfcefa 100644
--- a/resources/views/collections/edit.blade.php
+++ b/resources/views/collections/edit.blade.php
@@ -12,12 +12,10 @@
     </header>
 
     <collection-edit-form
-        initial-title="{{ $collection->title() }}"
         :blueprint="{{ json_encode($blueprint) }}"
         :initial-values="{{ json_encode($values) }}"
         :meta="{{ json_encode($meta) }}"
         url="{{ cp_route('collections.update', $collection->handle()) }}"
-        listing-url="{{ cp_route('collections.index')}}"
     ></collection-edit-form>
 
 @stop

From 575b134c20dbe7f80fe4d7acb3e22b506234e851 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 12:13:17 -0400
Subject: [PATCH 092/137] Bring up to speed with the collection edit form ui

---
 .../js/components/navigation/EditForm.vue     | 24 ++++++++-----------
 resources/views/navigation/edit.blade.php     | 10 ++++++--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/resources/js/components/navigation/EditForm.vue b/resources/js/components/navigation/EditForm.vue
index 055b72ef215..aeae6feab39 100644
--- a/resources/js/components/navigation/EditForm.vue
+++ b/resources/js/components/navigation/EditForm.vue
@@ -11,16 +11,16 @@
         :errors="errors"
         @updated="values = $event"
     >
-        <div slot-scope="{ setFieldValue }">
-            <header class="mb-3">
-                <breadcrumb :url="listingUrl" :title="title" />
-                <div class="flex items-center">
-                    <h1 class="flex-1" v-text="__('Configure Navigation')" />
-                    <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
-                </div>
-            </header>
+        <div slot-scope="{ setFieldValue, setFieldMeta }">
+            <configure-sections
+                @updated="setFieldValue"
+                @meta-updated="setFieldMeta"
+                :enable-sidebar="false" />
 
-            <configure-sections @updated="setFieldValue" :enable-sidebar="false" />
+            <div class="py-2 border-t flex justify-between">
+                <a :href="url" class="btn" v-text="__('Cancel') "/>
+                <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
+            </div>
         </div>
     </publish-container>
 
@@ -33,14 +33,11 @@ export default {
         blueprint: Object,
         initialValues: Object,
         meta: Object,
-        initialTitle: String,
-        url: String,
-        listingUrl: String,
+        url: String
     },
 
     data() {
         return {
-            title: this.initialTitle,
             values: this.initialValues,
             error: null,
             errors: {},
@@ -60,7 +57,6 @@ export default {
 
             this.$axios.patch(this.url, this.values).then(response => {
                 this.saving = false;
-                this.title = response.data.title;
                 this.$toast.success(__('Saved'));
                 this.$refs.container.saved();
             }).catch(e => this.handleAxiosError(e));
diff --git a/resources/views/navigation/edit.blade.php b/resources/views/navigation/edit.blade.php
index d520abba731..99eacb161d3 100644
--- a/resources/views/navigation/edit.blade.php
+++ b/resources/views/navigation/edit.blade.php
@@ -3,13 +3,19 @@
 
 @section('content')
 
+    <header class="mb-3">
+        @include('statamic::partials.breadcrumb', [
+            'url' => cp_route('navigation.show', $nav->handle()),
+            'title' => $nav->title()
+        ])
+        <h1>@yield('title')</h1>
+    </header>
+
     <navigation-edit-form
-        initial-title="{{ $nav->title() }}"
         :blueprint="{{ json_encode($blueprint) }}"
         :initial-values="{{ json_encode($values) }}"
         :meta="{{ json_encode($meta) }}"
         url="{{ $nav->showUrl() }}"
-        listing-url="{{ cp_route('navigation.index') }}"
     ></navigation-edit-form>
 
 @endsection

From 9653ae7738c8fcf56ba41667edcd21bbdbd5c30d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 15:54:10 -0400
Subject: [PATCH 093/137] Sites fieldtype

---
 src/Fieldtypes/Sites.php                   | 30 ++++++++++++++++++++++
 src/Providers/ExtensionServiceProvider.php |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 src/Fieldtypes/Sites.php

diff --git a/src/Fieldtypes/Sites.php b/src/Fieldtypes/Sites.php
new file mode 100644
index 00000000000..d82e7e1ba26
--- /dev/null
+++ b/src/Fieldtypes/Sites.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Statamic\Fieldtypes;
+
+use Statamic\Facades\Site;
+
+class Sites extends Relationship
+{
+    public function toItemArray($id)
+    {
+        if ($site = Site::get($id)) {
+            return [
+                'id' => $id,
+                'title' => $site->name(),
+            ];
+        }
+
+        return $this->invalidItemArray($id);
+    }
+
+    public function getIndexItems($request)
+    {
+        return Site::all()->map(function ($site) {
+            return [
+                'id' => $site->handle(),
+                'title' => $site->name(),
+            ];
+        })->values();
+    }
+}
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index d8e3a6588b6..c0f70e10434 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -88,6 +88,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\Section::class,
         Fieldtypes\Select::class,
         Fieldtypes\Sets::class,
+        Fieldtypes\Sites::class,
         Fieldtypes\Structures::class,
         Fieldtypes\StructureSites::class,
         Fieldtypes\Slug::class,

From 9a39717d3fd98db0eb1ed67e5c81a20bf602ac3b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 15:58:01 -0400
Subject: [PATCH 094/137] Structure sites are unnecessary. A nav's sites are
 determined by whether the yaml file exists.

---
 src/Stache/Stores/NavigationStore.php | 18 +++++++++---------
 src/Structures/Nav.php                |  4 +---
 src/Structures/Structure.php          | 11 -----------
 src/Structures/Tree.php               |  5 -----
 4 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/Stache/Stores/NavigationStore.php b/src/Stache/Stores/NavigationStore.php
index 72c0b234df6..0ce49b1f12a 100644
--- a/src/Stache/Stores/NavigationStore.php
+++ b/src/Stache/Stores/NavigationStore.php
@@ -51,13 +51,12 @@ protected function makeSingleSiteStructureFromFile($handle, $path, $data)
     {
         $structure = $this
             ->makeBaseStructureFromFile($handle, $path, $data)
-            ->sites([$site = Site::default()->handle()])
             ->maxDepth($data['max_depth'] ?? null)
             ->collections($data['collections'] ?? null);
 
         return $structure->addTree(
             $structure
-                ->makeTree($site)
+                ->makeTree(Site::default()->handle())
                 ->tree($data['tree'] ?? [])
         );
     }
@@ -66,11 +65,9 @@ protected function makeMultiSiteStructureFromFile($handle, $path, $data)
     {
         $structure = $this->makeBaseStructureFromFile($handle, $path, $data);
 
-        $structure->sites(Site::all()->filter(function ($site) use ($handle) {
+        Site::all()->filter(function ($site) use ($handle) {
             return File::exists($this->directory . $site->handle() . '/' . $handle . '.yaml');
-        })->map->handle()->values()->all());
-
-        $structure->sites()->map(function ($site) use ($structure) {
+        })->map->handle()->map(function ($site) use ($structure) {
             return $this->makeTree($structure, $site);
         })->filter()->each(function ($variables) use ($structure) {
             $structure->addTree($variables);
@@ -124,12 +121,15 @@ public function filter($file)
         return $file->getExtension() === 'yaml';
     }
 
-    public function save($structure)
+    public function save($nav)
     {
-        parent::save($structure);
+        parent::save($nav);
 
         if (Site::hasMultiple()) {
-            $structure->trees()->each->writeFile();
+            Site::all()->each(function ($site) use ($nav) {
+                $site = $site->handle();
+                $nav->existsIn($site) ? $nav->in($site)->writeFile() : $nav->makeTree($site)->deleteFile();
+            });
         }
     }
 }
diff --git a/src/Structures/Nav.php b/src/Structures/Nav.php
index 586fc17a478..fa5ff8f9be8 100644
--- a/src/Structures/Nav.php
+++ b/src/Structures/Nav.php
@@ -46,9 +46,7 @@ public function fileData()
             'root' => $this->expectsRoot ?: null,
         ];
 
-        if (Site::hasMultiple()) {
-            $data['sites'] = $this->sites;
-        } else {
+        if (! Site::hasMultiple()) {
             $data = array_merge($data, $this->in(Site::default()->handle())->fileData());
         }
 
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index fdc8b168247..93cd486ac22 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -19,7 +19,6 @@ abstract class Structure implements StructureContract
 
     protected $title;
     protected $handle;
-    protected $sites;
     protected $trees;
     protected $collection;
     protected $maxDepth;
@@ -50,16 +49,6 @@ public function title($title = null)
             })->args(func_get_args());
     }
 
-    public function sites($sites = null)
-    {
-        return $this
-            ->fluentlyGetOrSet('sites')
-            ->getter(function ($sites) {
-                return collect(Site::hasMultiple() ? $sites : [Site::default()->handle()]);
-            })
-            ->args(func_get_args());
-    }
-
     public function expectsRoot($expectsRoot = null)
     {
         return $this->fluentlyGetOrSet('expectsRoot')->args(func_get_args());
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 59a9d99371e..05eb14fee1e 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -46,11 +46,6 @@ public function root()
         return $this->tree[0]['entry'];
     }
 
-    public function sites()
-    {
-        $this->structure->sites();
-    }
-
     public function handle()
     {
         return $this->structure->handle();

From dc2fb11ed5ca5607a4f4c574caddb4b52e8ad68a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 16:01:32 -0400
Subject: [PATCH 095/137] Nav sites tweaks ...

- Visiting a non-existent nav site redirects to the first site.
- Pass the sites to the show view using trees.
- Updating a nav will update its trees appropriately using a simple sites fieldtype.
---
 .../CP/Structures/NavigationController.php    | 56 +++++++------------
 src/Structures/Tree.php                       |  5 ++
 tests/Feature/Navigation/MocksStructures.php  |  3 +-
 .../Navigation/UpdateNavigationTest.php       | 32 +++++++++++
 4 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/src/Http/Controllers/CP/Structures/NavigationController.php b/src/Http/Controllers/CP/Structures/NavigationController.php
index eb9bf5f002e..4602f99211e 100644
--- a/src/Http/Controllers/CP/Structures/NavigationController.php
+++ b/src/Http/Controllers/CP/Structures/NavigationController.php
@@ -50,16 +50,7 @@ public function edit($nav)
             'handle' => $nav->handle(),
             'collections' => $nav->collections()->map->handle()->all(),
             'root' => $nav->expectsRoot(),
-            'sites' => Site::all()->map(function ($site) use ($nav) {
-                $tree = $nav->in($site->handle());
-                return [
-                    'name' => $site->name(),
-                    'handle' => $site->handle(),
-                    'enabled' => $enabled = $tree !== null,
-                    'route' => $enabled ? $tree->route() : null,
-                    'inherit' => false,
-                ];
-            })->values()->all()
+            'sites' => $nav->trees()->keys()->all(),
         ];
 
         $fields = ($blueprint = $this->editFormBlueprint($nav))
@@ -77,12 +68,12 @@ public function edit($nav)
 
     public function show(Request $request, $nav)
     {
-        $nav = Nav::find($nav);
+        abort_if(! $nav = Nav::find($nav), 404);
 
         $site = $request->site ?? Site::selected()->handle();
 
-        if (! $nav || ! $tree = $nav->in($site)) {
-            return abort(404);
+        if (! $nav->existsIn($site)) {
+            return redirect($nav->trees()->first()->showUrl());
         }
 
         return view('statamic::navigation.show', [
@@ -90,13 +81,13 @@ public function show(Request $request, $nav)
             'nav' => $nav,
             'expectsRoot' => $nav->expectsRoot(),
             'collections' => $nav->collections()->map->handle()->all(),
-            'sites' => $nav->sites()->map(function ($handle) use ($nav) {
+            'sites' => $nav->trees()->map(function ($tree) use ($nav) {
                 return [
-                    'handle' => $handle,
-                    'name' => Site::get($handle)->name(),
-                    'url' => $nav->in($handle)->showUrl(),
+                    'handle' => $tree->locale(),
+                    'name' => $tree->site()->name(),
+                    'url' => $tree->showUrl(),
                 ];
-            })->all()
+            })->values()->all()
         ]);
     }
 
@@ -118,28 +109,17 @@ public function update(Request $request, $nav)
             ->collections($values['collections'])
             ->maxDepth($values['max_depth']);
 
-        $sites = $values['sites'] ?? [];
+        $existingSites = $nav->trees()->keys()->all();
 
-        if (!empty($sites)) {
-            $nav->sites($sites->filter->enabled->map->handle->values()->all());
-        }
-
-        foreach ($sites as $site) {
-            $tree = $nav->in($site['handle']);
-
-            if ($tree && !$site['enabled']) {
-                $nav->removeTree($tree);
+        if ($sites = Arr::get($values, 'sites')) {
+            foreach ($sites as $site) {
+                $tree = $nav->in($site) ?? $nav->makeTree($site);
+                $nav->addTree($tree);
             }
 
-            if (!$tree && $site['enabled']) {
-                $tree = $nav->makeTree($site['handle']);
+            foreach (array_diff($existingSites, $sites) as $site) {
+                $nav->removeTree($nav->in($site));
             }
-
-            if (!$site['enabled']) {
-                continue;
-            }
-
-            $nav->addTree($tree);
         }
 
         $nav->save();
@@ -218,8 +198,10 @@ public function editFormBlueprint()
 
         if (Site::hasMultiple()) {
             $contents['options']['fields']['sites'] = [
-                'type' => 'structure_sites',
+                'type' => 'sites',
                 'display' => __('Sites'),
+                'mode' => 'select',
+                'required' => true,
             ];
         };
 
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 05eb14fee1e..152b86f2153 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -23,6 +23,11 @@ public function locale($locale = null)
         return $this->fluentlyGetOrSet('locale')->args(func_get_args());
     }
 
+    public function site()
+    {
+        return Site::get($this->locale());
+    }
+
     public function structure($structure = null)
     {
         return $this->fluentlyGetOrSet('structure')->args(func_get_args());
diff --git a/tests/Feature/Navigation/MocksStructures.php b/tests/Feature/Navigation/MocksStructures.php
index c2f89b69829..f5d5542ac98 100644
--- a/tests/Feature/Navigation/MocksStructures.php
+++ b/tests/Feature/Navigation/MocksStructures.php
@@ -11,7 +11,8 @@ trait MocksStructures
     private function createNav($handle)
     {
         return tap(Mockery::mock(Nav::class), function ($s) use ($handle) {
-            $s->shouldReceive('in')->andReturn($this->createStructureTree($handle));
+            $s->shouldReceive('in')->andReturn($tree = $this->createStructureTree($handle));
+            $s->shouldReceive('trees')->andReturn(collect([$tree]));
             $s->shouldReceive('title')->andReturn($handle);
             $s->shouldReceive('handle')->andReturn($handle);
             $s->shouldReceive('showUrl')->andReturn('/nav-show-url');
diff --git a/tests/Feature/Navigation/UpdateNavigationTest.php b/tests/Feature/Navigation/UpdateNavigationTest.php
index abfd0eff146..4944c708215 100644
--- a/tests/Feature/Navigation/UpdateNavigationTest.php
+++ b/tests/Feature/Navigation/UpdateNavigationTest.php
@@ -6,6 +6,7 @@
 use Statamic\Events\Data\CollectionSaved;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Nav;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\Structures\NavigationController;
 use Tests\FakesRoles;
@@ -49,6 +50,37 @@ function it_updates_a_nav()
         $this->assertTrue($updated->expectsRoot());
     }
 
+    /** @test */
+    function it_updates_a_nav_with_multiple_sites()
+    {
+
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr'],
+            'de' => ['url' => 'http://localhost/de/', 'locale' => 'de'],
+        ]]);
+
+        $nav = $this->createNav();
+        $nav->addTree($nav->makeTree('de'));
+        $this->assertCount(1, Nav::all());
+        $this->assertEquals(['en', 'de'], Nav::all()->first()->trees()->keys()->all());
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->submit($nav, $this->validParams(['sites' => [
+                'en', 'fr' // starts with en+de, but should remove de and add fr, ending with en+fr
+            ]]))
+            ->assertOk()
+            ->assertJson(['title' => 'Updated']);
+
+        $this->assertCount(1, Nav::all());
+        $updated = Nav::all()->first();
+        $this->assertEquals('Updated', $updated->title());
+        $this->assertEquals(2, $updated->maxDepth());
+        $this->assertTrue($updated->expectsRoot());
+        $this->assertEquals(['en', 'fr'], $updated->trees()->keys()->all());
+    }
+
     /** @test */
     function title_is_required()
     {

From 47e4a5856039cf0b449267ef3eb9b62ee2560fb7 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Mar 2020 16:01:43 -0400
Subject: [PATCH 096/137] Only show the selector when there's more than 1 site.

---
 resources/js/components/navigation/View.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 3786d0cda83..6b6ebfeb75c 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -15,6 +15,7 @@
                 <a @click="$refs.tree.cancel" class="text-2xs text-blue mr-2 underline" v-if="isDirty" v-text="__('Discard changes')" />
 
                 <site-selector
+                    v-if="sites.length > 1"
                     :sites="sites"
                     :value="site"
                     @input="siteSelected"

From f236d5eb5e649100c7248edd32fb6a0a2570c47e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Mar 2020 13:00:26 -0400
Subject: [PATCH 097/137] Collection route and site tweaks ...

- The $collection->route() method is now a getter, and you have to provide the site handle.
- The $collection->routes() method is a getter and setter.
  - As a getter, it gives you a collection of routes keyed by handle. It will filter out routes where the collection doesn't use that site.
  - As a setter, you can pass an array of routes keyed by site handle.
  - It accepts a string, and results in the same route being used for all sites.
- The $collection->sites() method will default to the default site if in multisite mode and no sites have been explicitly set.
---
 src/Entries/Collection.php                    | 31 +++++++--
 src/Entries/Entry.php                         |  2 +-
 src/Stache/Stores/CollectionsStore.php        |  2 +-
 src/Structures/CollectionStructure.php        |  4 +-
 tests/Auth/Protect/PageProtectionTestCase.php |  2 +-
 tests/Data/Entries/CollectionTest.php         | 64 +++++++++++++++++--
 tests/Data/Entries/EntryTest.php              |  4 +-
 .../Structures/CollectionStructureTest.php    |  7 +-
 tests/Feature/Entries/MountingTest.php        |  4 +-
 tests/Fieldtypes/EntriesTest.php              |  2 +-
 tests/FrontendTest.php                        |  4 +-
 tests/Routing/RoutesTest.php                  |  2 +-
 12 files changed, 100 insertions(+), 28 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index d9713c893de..c617a78566d 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -23,7 +23,7 @@ class Collection implements Contract
     use FluentlyGetsAndSets, ExistsAsFile;
 
     protected $handle;
-    protected $route;
+    protected $routes = [];
     protected $mount;
     protected $title;
     protected $template;
@@ -60,9 +60,22 @@ public function handle($handle = null)
         return $this->fluentlyGetOrSet('handle')->args(func_get_args());
     }
 
-    public function route($route = null)
+    public function routes($routes = null)
     {
-        return $this->fluentlyGetOrSet('route')->args(func_get_args());
+        return $this
+            ->fluentlyGetOrSet('routes')
+            ->getter(function ($routes) {
+                return $this->sites()->mapWithKeys(function ($site) use ($routes) {
+                    $siteRoute = is_string($routes) ? $routes : ($routes[$site] ?? null);
+                    return [$site => $siteRoute];
+                });
+            })
+            ->args(func_get_args());
+    }
+
+    public function route($site)
+    {
+        return $this->routes()->get($site);
     }
 
     public function dated($dated = null)
@@ -240,7 +253,11 @@ public function sites($sites = null)
         return $this
             ->fluentlyGetOrSet('sites')
             ->getter(function ($sites) {
-                return collect(Site::hasMultiple() ? $sites : [Site::default()->handle()]);
+                if (! Site::hasMultiple() || ! $sites) {
+                    $sites = [Site::default()->handle()];
+                }
+
+                return collect($sites);
             })
             ->args(func_get_args());
     }
@@ -333,9 +350,13 @@ public function fileData()
             'dated',
             'structured',
             'orderable',
+            'routes'
         ]);
 
+        $route = is_string($this->routes) ? $this->routes : $this->routes()->filter()->all();
+
         $array = Arr::removeNullValues(array_merge($array, [
+            'route' => $route,
             'amp' => $array['amp'] ?: null,
             'date' => $this->dated ?: null,
             'sort_by' => $this->sortField,
@@ -400,7 +421,7 @@ public function toArray()
         return [
             'title' => $this->title,
             'handle' => $this->handle,
-            'route' => $this->route,
+            'routes' => $this->routes,
             'dated' => $this->dated,
             'past_date_behavior' => $this->pastDateBehavior(),
             'future_date_behavior' => $this->futureDateBehavior(),
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 173470e06db..9f470232ec1 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -525,7 +525,7 @@ public function page()
 
     public function route()
     {
-        return $this->collection()->route();
+        return $this->collection()->route($this->locale());
     }
 
     public function routeData()
diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index df259149f17..2116b5c14f3 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -38,7 +38,7 @@ public function makeItemFromFile($path, $contents)
 
         $collection = Collection::make($handle)
             ->title(array_get($data, 'title'))
-            ->route(array_get($data, 'route'))
+            ->routes(array_get($data, 'route'))
             ->mount(array_get($data, 'mount'))
             ->dated(array_get($data, 'date', false))
             ->ampable(array_get($data, 'amp', false))
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
index 16b2a406431..aab378f5ac6 100644
--- a/src/Structures/CollectionStructure.php
+++ b/src/Structures/CollectionStructure.php
@@ -48,9 +48,7 @@ public function collections($collections = null)
 
     public function route(string $site): ?string
     {
-        return is_array($route = $this->collection->route())
-            ? ($route[$site] ?? null)
-            : $route;
+        return $this->collection->route($site);
     }
 
     public function validateTree(array $tree): array
diff --git a/tests/Auth/Protect/PageProtectionTestCase.php b/tests/Auth/Protect/PageProtectionTestCase.php
index f1e84acbbc9..7a42cde6971 100644
--- a/tests/Auth/Protect/PageProtectionTestCase.php
+++ b/tests/Auth/Protect/PageProtectionTestCase.php
@@ -30,7 +30,7 @@ protected function requestPageProtectedBy($scheme, $headers = [])
     protected function createPage($slug, $attributes = [])
     {
         $collection = Collection::make('pages')
-            ->route('{slug}')
+            ->routes('{slug}')
             ->template('default')
             ->save();
 
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index aa2c678a687..f4bb1ecaabe 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -31,15 +31,69 @@ function it_gets_and_sets_the_handle()
     }
 
     /** @test */
-    function it_gets_and_sets_the_route()
+    function it_gets_and_sets_the_routes()
     {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/'],
+            'fr' => ['url' => 'http://domain.com/fr/'],
+            'de' => ['url' => 'http://domain.com/de/'],
+        ]]);
+
+        // A collection with no sites uses the default site.
         $collection = new Collection;
-        $this->assertNull($collection->route());
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $collection->routes());
+        $this->assertEquals(['en' => null], $collection->routes()->all());
+
+        $return = $collection->routes([
+            'en' => 'blog/{slug}',
+            'fr' => 'le-blog/{slug}',
+            'de' => 'das-blog/{slug}'
+        ]);
+
+        $this->assertEquals($collection, $return);
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $collection->routes());
+
+        // Only routes corresponding to the collection's sites will be returned.
+        $this->assertEquals(['en' => 'blog/{slug}'], $collection->routes()->all());
+        $this->assertEquals('blog/{slug}', $collection->route('en'));
+        $this->assertNull($collection->route('fr'));
+        $this->assertNull($collection->route('de'));
+        $this->assertNull($collection->route('unknown'));
+
+        $collection->sites(['en', 'fr']);
+
+        $this->assertEquals([
+            'en' => 'blog/{slug}',
+            'fr' => 'le-blog/{slug}'
+        ], $collection->routes()->all());
+        $this->assertEquals('blog/{slug}', $collection->route('en'));
+        $this->assertEquals('le-blog/{slug}', $collection->route('fr'));
+        $this->assertNull($collection->route('de'));
+        $this->assertNull($collection->route('unknown'));
+    }
+
+    /** @test */
+    function it_sets_all_the_routes_identically()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/'],
+            'fr' => ['url' => 'http://domain.com/fr/'],
+            'de' => ['url' => 'http://domain.com/de/'],
+        ]]);
+
+        $collection = (new Collection)->sites(['en', 'fr']);
 
-        $return = $collection->route('{slug}');
+        $return = $collection->routes('{slug}');
 
         $this->assertEquals($collection, $return);
-        $this->assertEquals('{slug}', $collection->route());
+        $this->assertEquals([
+            'en' => '{slug}',
+            'fr' => '{slug}'
+        ], $collection->routes()->all());
+        $this->assertEquals('{slug}', $collection->route('en'));
+        $this->assertEquals('{slug}', $collection->route('fr'));
+        $this->assertNull($collection->route('de'));
+        $this->assertNull($collection->route('unknown'));
     }
 
     /** @test */
@@ -90,7 +144,7 @@ function it_gets_and_sets_the_sites_it_can_be_used_in_when_using_multiple_sites(
 
         $sites = $collection->sites();
         $this->assertInstanceOf(\Illuminate\Support\Collection::class, $sites);
-        $this->assertEquals([], $sites->all());
+        $this->assertEquals(['en'], $sites->all()); // collection with no sites will resolve to the default site.
 
         $return = $collection->sites(['en', 'fr']);
 
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index e478bd3081d..f2333de9707 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -204,7 +204,7 @@ function it_gets_the_url_from_the_collection()
             'de' => ['url' => 'http://domain.de/'],
         ]]);
 
-        $collection = (new Collection)->handle('blog')->ampable(true)->route([
+        $collection = (new Collection)->sites(['en', 'fr', 'de'])->handle('blog')->ampable(true)->routes([
             'en' => 'blog/{slug}',
             'fr' => 'le-blog/{slug}',
             'de' => 'das-blog/{slug}',
@@ -262,7 +262,7 @@ function it_compiles_augmented_array_data()
             ->id('test-id')
             ->locale('en')
             ->slug('test')
-            ->collection(Collection::make('blog')->route('blog/{slug}')->save())
+            ->collection(Collection::make('blog')->routes('blog/{slug}')->save())
             ->data([
                 'foo' => 'bar',
                 'bar' => 'baz',
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
index f19d72039e1..a6a78d55340 100644
--- a/tests/Data/Structures/CollectionStructureTest.php
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -110,10 +110,9 @@ function it_gets_the_route_from_the_collection()
     function it_gets_the_route_from_the_collection_when_it_has_multiple()
     {
         $collection = $this->mock(Collection::class);
-        $collection->shouldReceive('route')->times(3)->andReturn([
-            'en' => '/en-route',
-            'fr' => '/fr-route',
-        ]);
+        $collection->shouldReceive('route')->with('en')->once()->andReturn('/en-route');
+        $collection->shouldReceive('route')->with('fr')->once()->andReturn('/fr-route');
+        $collection->shouldReceive('route')->with('de')->once()->andReturnNull();
 
         $structure = $this->structure()->collection($collection);
 
diff --git a/tests/Feature/Entries/MountingTest.php b/tests/Feature/Entries/MountingTest.php
index b26d29f2af8..616768acb2b 100644
--- a/tests/Feature/Entries/MountingTest.php
+++ b/tests/Feature/Entries/MountingTest.php
@@ -15,11 +15,11 @@ class MountingTest extends TestCase
     /** @test */
     function updating_a_mounted_page_will_update_the_uris_for_each_entry_in_that_collection()
     {
-        Collection::make('pages')->route('pages/{slug}')->save();
+        Collection::make('pages')->routes('pages/{slug}')->save();
 
         EntryFactory::collection('pages')->slug('another-page')->create();
         $mount = EntryFactory::collection('pages')->slug('blog')->create();
-        Collection::make('blog')->route('{mount}/{slug}')->mount($mount->id())->save();
+        Collection::make('blog')->routes('{mount}/{slug}')->mount($mount->id())->save();
 
         $one = EntryFactory::collection('blog')->slug('one')->create();
         $two = EntryFactory::collection('blog')->slug('two')->create();
diff --git a/tests/Fieldtypes/EntriesTest.php b/tests/Fieldtypes/EntriesTest.php
index e6c423da707..79b92154a73 100644
--- a/tests/Fieldtypes/EntriesTest.php
+++ b/tests/Fieldtypes/EntriesTest.php
@@ -20,7 +20,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $collection = tap(Facades\Collection::make('blog')->route('blog/{slug}'))->save();
+        $collection = tap(Facades\Collection::make('blog')->routes('blog/{slug}'))->save();
         EntryFactory::id('123')->collection($collection)->slug('one')->create();
         EntryFactory::id('456')->collection($collection)->slug('two')->create();
     }
diff --git a/tests/FrontendTest.php b/tests/FrontendTest.php
index 552e6403394..4d2e3c44d7d 100644
--- a/tests/FrontendTest.php
+++ b/tests/FrontendTest.php
@@ -350,7 +350,7 @@ function it_sets_the_translation_locale_based_on_site()
         $this->viewShouldReturnRaw('layout', '{{ template_content }}');
         $this->viewShouldReturnRaw('some_template', '<p>{{ trans key="test::messages.hello" }}</p>');
 
-        $this->makeCollection()->save();
+        $this->makeCollection()->sites(['english', 'french'])->save();
         tap($this->makePage('about', ['with' => ['template' => 'some_template']])->locale('english'))->save();
         tap($this->makePage('le-about', ['with' => ['template' => 'some_template']])->locale('french'))->save();
 
@@ -377,7 +377,7 @@ private function makePage($slug, $attributes = [])
     private function makeCollection()
     {
         return Collection::make('pages')
-            ->route('{slug}')
+            ->routes('{slug}')
             ->template('default')
             ->entryBlueprints(['empty']);
     }
diff --git a/tests/Routing/RoutesTest.php b/tests/Routing/RoutesTest.php
index 8977791f1e0..bc590207b77 100644
--- a/tests/Routing/RoutesTest.php
+++ b/tests/Routing/RoutesTest.php
@@ -122,7 +122,7 @@ function it_loads_content()
     /** @test */
     function it_loads_content_by_uri()
     {
-        $collection = Collection::make('pages')->route('/{slug}')->save();
+        $collection = Collection::make('pages')->routes('/{slug}')->save();
         EntryFactory::id('pages-blog')->collection($collection)->slug('blog')->data(['title' => 'Blog'])->create();
 
         $this->viewShouldReturnRaw('layout', '{{ template_content }}');

From 287c20ef9d9efd988101ebe69883dbb67651c8c5 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Mar 2020 13:06:47 -0400
Subject: [PATCH 098/137] Collection edit tweaks ...

- Add a sites field when in multisite mode
- Add a routes field that allows you to enter a single route or a route for each selected site.
- Scope the configure label css so it only targets the field labels, not all of them (eg. the radio buttons)
---
 resources/js/bootstrap/fieldtypes.js          |   1 +
 .../js/components/collections/Routes.vue      | 116 ++++++++++++++++++
 resources/sass/components/configure.scss      |   2 +-
 src/Fieldtypes/CollectionRoutes.php           |  10 ++
 .../CP/Collections/CollectionsController.php  |  31 ++++-
 src/Providers/ExtensionServiceProvider.php    |   1 +
 6 files changed, 155 insertions(+), 6 deletions(-)
 create mode 100644 resources/js/components/collections/Routes.vue
 create mode 100644 src/Fieldtypes/CollectionRoutes.php

diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index ba24c3513d6..0f53341c238 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -25,6 +25,7 @@ Vue.component('bard-fieldtype', require('../components/fieldtypes/bard/BardField
 Vue.component('bard_buttons_setting-fieldtype', require('../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue').default);
 Vue.component('checkboxes-fieldtype', require('../components/fieldtypes/CheckboxesFieldtype.vue').default);
 Vue.component('code-fieldtype', require('../components/fieldtypes/CodeFieldtype.vue').default);
+Vue.component('collection_routes-fieldtype', require('../components/collections/Routes.vue').default);
 Vue.component('color-fieldtype', require('../components/fieldtypes/ColorFieldtype.vue').default);
 Vue.component('date-fieldtype', require('../components/fieldtypes/DateFieldtype.vue').default);
 Vue.component('fieldset-fieldtype', FieldsetFieldtype);
diff --git a/resources/js/components/collections/Routes.vue b/resources/js/components/collections/Routes.vue
new file mode 100644
index 00000000000..817fa312d32
--- /dev/null
+++ b/resources/js/components/collections/Routes.vue
@@ -0,0 +1,116 @@
+<template>
+
+    <div>
+        <div v-if="hasMultipleSites">
+            <div class="radio-fieldtype mb-1">
+                <radio-fieldtype handle="route_mode" v-model="routeMode" :config="{
+                    inline: true,
+                    options: {
+                        single: 'Single route',
+                        multiple: 'Separate route for each site',
+                    }
+                }" />
+            </div>
+            <table class="grid-table" v-if="perSiteRouting">
+                <thead>
+                    <tr>
+                        <th>Site</th>
+                        <th class="w-2/3">Route</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="site in sites" :key="site.handle">
+                        <td class="align-middle" v-text="site.name" />
+                        <td>
+                            <text-input
+                                class="font-mono text-xs"
+                                :value="value[site.handle]"
+                                @input="updateSiteRoute(site.handle, $event)" />
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div v-if="!hasMultipleSites || !perSiteRouting">
+            <text-input v-model="singleRoute" class="font-mono text-xs" />
+        </div>
+    </div>
+
+</template>
+
+<script>
+export default {
+
+    mixins: [Fieldtype],
+
+    inject: ['storeName'],
+
+    data() {
+        return {
+            routeMode: null,
+            singleRoute: null,
+        }
+    },
+
+    created() {
+        this.routeMode = this.identicalRoutes ? 'single' : 'multiple';
+    },
+
+    computed: {
+
+        sites() {
+            let state = this.$store.state.publish[this.storeName];
+
+            return state.values.sites.map((handle, i) => {
+                return {
+                    handle,
+                    name: state.meta.sites.data[i].title
+                }
+            });
+        },
+
+        hasMultipleSites() {
+            return this.sites.length > 1;
+        },
+
+        perSiteRouting() {
+            return this.routeMode === 'multiple';
+        },
+
+        identicalRoutes() {
+            return _.uniq(Object.values(this.value)).length === 1;
+        }
+
+    },
+
+    watch: {
+
+        singleRoute(route) {
+            this.update(route);
+        },
+
+        routeMode(mode) {
+            if (mode === 'single') {
+                this.singleRoute = Object.values(this.value)[0];
+            } else {
+                let value = {};
+                this.sites.forEach(site => value[site.handle] = '');
+                this.update(value);
+            }
+        }
+
+    },
+
+    methods: {
+
+        updateSiteRoute(site, route) {
+            let value = this.value;
+            value[site] = route;
+            this.update(value);
+        }
+
+    }
+
+}
+</script>
diff --git a/resources/sass/components/configure.scss b/resources/sass/components/configure.scss
index 35cbf757d8f..404f8d89fcd 100644
--- a/resources/sass/components/configure.scss
+++ b/resources/sass/components/configure.scss
@@ -7,7 +7,7 @@
            @apply border-b;
        }
 
-       label {
+       .publish-field-label {
            @apply text-base;
        }
 
diff --git a/src/Fieldtypes/CollectionRoutes.php b/src/Fieldtypes/CollectionRoutes.php
new file mode 100644
index 00000000000..b635000ce3c
--- /dev/null
+++ b/src/Fieldtypes/CollectionRoutes.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Statamic\Fieldtypes;
+
+use Statamic\Fields\Fieldtype;
+
+class CollectionRoutes extends Fieldtype
+{
+    protected $selectable = false;
+}
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 1bb653ff931..1febd2024bb 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -135,8 +135,9 @@ public function edit($collection)
             'default_publish_state' => $collection->defaultPublishState(),
             'template' => $collection->template(),
             'layout' => $collection->layout(),
-            'route' => $collection->route(),
             'amp' => $collection->ampable(),
+            'sites' => $collection->sites()->all(),
+            'routes' => $collection->routes()->all(),
         ];
 
         $fields = ($blueprint = $this->editFormBlueprint())
@@ -194,7 +195,8 @@ public function update(Request $request, $collection)
 
         $collection
             ->title($values['title'])
-            ->route($values['route'])
+            ->sites($values['sites'])
+            ->routes($values['routes'])
             ->dated($values['dated'])
             ->template($values['template'])
             ->layout($values['layout'])
@@ -256,7 +258,7 @@ public function destroy($collection)
 
     protected function editFormBlueprint()
     {
-        return Blueprint::makeFromSections([
+        $fields = [
             'name' => [
                 'display' => __('Name'),
                 'fields' => [
@@ -356,11 +358,28 @@ protected function editFormBlueprint()
                     ],
                 ]
             ],
+        ];
+
+        if (Site::hasMultiple()) {
+            $fields['sites'] = [
+                'display' => __('Sites'),
+                'fields' => [
+                    'sites' => [
+                        'type' => 'sites',
+                        'mode' => 'select',
+                        'required' => true,
+                    ]
+                ]
+            ];
+        }
+
+        $fields = array_merge($fields, [
             'routing' => [
                 'display' => 'Routing & URLs',
                 'fields' => [
-                    'route' => [
-                        'type' => 'text',
+                    'routes' => [
+                        'display' => __('Route'),
+                        'type' => 'collection_routes',
                         'instructions' => __('statamic::messages.collections_route_instructions'),
                     ],
                     'amp' => [
@@ -371,5 +390,7 @@ protected function editFormBlueprint()
                 ]
             ]
         ]);
+
+        return Blueprint::makeFromSections($fields);
     }
 }
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index c0f70e10434..a7d14c9a4fd 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -70,6 +70,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\Blueprints::class,
         Fieldtypes\Checkboxes::class,
         Fieldtypes\Code::class,
+        Fieldtypes\CollectionRoutes::class,
         Fieldtypes\Collections::class,
         Fieldtypes\Color::class,
         Fieldtypes\Date::class,

From f0c1acbdc40b571fa1c594e15b7f91eadc2528a9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Mar 2020 13:07:03 -0400
Subject: [PATCH 099/137] Remove unused structure sites fieldtype

---
 resources/js/bootstrap/fieldtypes.js         |  1 -
 resources/js/components/structures/Sites.vue | 90 --------------------
 src/Fieldtypes/StructureSites.php            | 10 ---
 src/Providers/ExtensionServiceProvider.php   |  1 -
 4 files changed, 102 deletions(-)
 delete mode 100644 resources/js/components/structures/Sites.vue
 delete mode 100644 src/Fieldtypes/StructureSites.php

diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index 0f53341c238..6bb612187cb 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -49,7 +49,6 @@ Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFiel
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
 Vue.component('status-fieldtype', StatusFieldtype);
-Vue.component('structure_sites-fieldtype', require('../components/structures/Sites.vue').default);
 Vue.component('table-fieldtype', require('../components/fieldtypes/TableFieldtype.vue').default);
 Vue.component('tags-fieldtype', require('../components/fieldtypes/TagsFieldtype.vue').default);
 Vue.component('tags-fieldtype-index', require('../components/fieldtypes/TagsIndexFieldtype.vue').default);
diff --git a/resources/js/components/structures/Sites.vue b/resources/js/components/structures/Sites.vue
deleted file mode 100644
index a10c8d5c1b3..00000000000
--- a/resources/js/components/structures/Sites.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-
-    <div>
-        <div v-if="hasMultipleSites">
-            <div class="help-block -mt-1">
-                Select which sites this structure will be allowed in. A tree's pages may be defined per site, or it can inherit from another.
-            </div>
-            <table class="grid-table">
-                <thead>
-                    <tr>
-                        <th>Site</th>
-                        <th>Route</th>
-                        <th>Tree</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr v-for="site in sites" :key="site.handle">
-                        <td class="align-middle">
-                            <div class="flex items-center">
-                                <toggle-fieldtype handle="enabled" v-model="site.enabled" />
-                                <div class="ml-2">{{ site.name }}</div>
-                            </div>
-                        </td>
-                        <td><text-input v-model="site.route" :is-read-only="!site.enabled" /></td>
-                        <td>
-                            <v-select
-                                v-model="site.inherit"
-                                :options="sites"
-                                label="name"
-                                :reduce="opt => opt.handle"
-                                :placeholder="__('Unique')"
-                            />
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-
-        <div v-if="!hasMultipleSites">
-            <text-input v-model="sites[0].route" />
-        </div>
-    </div>
-
-</template>
-
-<script>
-export default {
-
-    mixins: [Fieldtype],
-
-    inject: ['storeName'],
-
-    data() {
-        return {
-            sites: this.value,
-        }
-    },
-
-    computed: {
-
-        hasMultipleSites() {
-            return this.$config.get('sites').length > 1;
-        },
-
-        purpose() {
-            return this.$store.state.publish[this.storeName].values.purpose;
-        }
-
-    },
-
-    watch: {
-        sites(sites) {
-            this.update(sites);
-        },
-
-        purpose: {
-            immediate: true,
-            handler(purpose) {
-                // We can't use a field condition because the logic also relies on whether we have multiple sites enabled.
-                if (this.hasMultipleSites) return;
-
-                this.$nextTick(() => {
-                    this.$el.closest('.form-group').classList.toggle('hidden', purpose === 'navigation');
-                });
-            }
-        }
-    }
-
-}
-</script>
diff --git a/src/Fieldtypes/StructureSites.php b/src/Fieldtypes/StructureSites.php
deleted file mode 100644
index c692c17653c..00000000000
--- a/src/Fieldtypes/StructureSites.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Statamic\Fieldtypes;
-
-use Statamic\Fields\Fieldtype;
-
-class StructureSites extends Fieldtype
-{
-    protected $selectable = false;
-}
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index a7d14c9a4fd..1fb4f10c0a9 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -91,7 +91,6 @@ class ExtensionServiceProvider extends ServiceProvider
         Fieldtypes\Sets::class,
         Fieldtypes\Sites::class,
         Fieldtypes\Structures::class,
-        Fieldtypes\StructureSites::class,
         Fieldtypes\Slug::class,
         Fieldtypes\Table::class,
         Fieldtypes\Tags::class,

From 4bb18df5b0b65f9b7f316d76e900e16322263ae2 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Mar 2020 13:22:44 -0400
Subject: [PATCH 100/137] Allow site switching on collection structures

---
 resources/js/components/collections/View.vue    | 15 +++++++++++++--
 resources/js/components/navigation/View.vue     |  2 +-
 resources/js/components/structures/PageTree.vue |  6 +++++-
 .../{navigation => structures}/SiteSelector.vue |  0
 resources/views/collections/show.blade.php      |  1 +
 .../CP/Collections/CollectionsController.php    | 17 +++++------------
 6 files changed, 25 insertions(+), 16 deletions(-)
 rename resources/js/components/{navigation => structures}/SiteSelector.vue (100%)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 2edba37adea..6fc994aa308 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -31,6 +31,13 @@
                         @click="cancelTreeProgress"
                     />
 
+                    <site-selector
+                        v-if="structureSites.length > 1"
+                        :sites="structureSites"
+                        :value="treeSite"
+                        @input="treeSite = $event.handle"
+                    />
+
                     <button
                         class="btn mx-2"
                         :class="{ 'disabled': !treeIsDirty, 'btn-danger': deletedEntries.length }"
@@ -72,7 +79,7 @@
             :submit-parameters="{ deletedEntries }"
             :max-depth="structureMaxDepth"
             :expects-root="structureExpectsRoot"
-            :site="site"
+            :site="treeSite"
             @edit-page="editPage"
             @changed="markTreeDirty"
             @saved="markTreeClean"
@@ -112,12 +119,14 @@
 <script>
 import PageTree from '../structures/PageTree.vue';
 import DeleteEntryConfirmation from './DeleteEntryConfirmation.vue';
+import SiteSelector from '../structures/SiteSelector.vue';
 
 export default {
 
     components: {
         PageTree,
-        DeleteEntryConfirmation
+        DeleteEntryConfirmation,
+        SiteSelector
     },
 
     props: {
@@ -139,6 +148,7 @@ export default {
         structureSubmitUrl: { type: String },
         structureMaxDepth: { type: Number, default: Infinity },
         structureExpectsRoot: { type: Boolean },
+        structureSites: { type: Array },
     },
 
     data() {
@@ -149,6 +159,7 @@ export default {
             showEntryDeletionConfirmation: false,
             entryBeingDeleted: null,
             entryDeletionConfirmCallback: null,
+            treeSite: this.site,
         }
     },
 
diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 6b6ebfeb75c..4722c82ce79 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -109,7 +109,7 @@ import PageTree from '../structures/PageTree.vue';
 import PageEditor from '../structures/PageEditor.vue';
 import PageSelector from '../structures/PageSelector.vue';
 import RemovePageConfirmation from './RemovePageConfirmation.vue';
-import SiteSelector from './SiteSelector.vue';
+import SiteSelector from '../structures/SiteSelector.vue';
 
 export default {
 
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index cb187ba58b1..763ce3c5b34 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -16,7 +16,7 @@
             </div>
         </div>
 
-        <div class="page-tree w-full">
+        <div v-if="!loading" class="page-tree w-full">
             <draggable-tree
                 draggable
                 ref="tree"
@@ -117,6 +117,10 @@ export default {
 
         pageIds(ids) {
             this.$emit('page-ids-updated', ids);
+        },
+
+        site(site) {
+            this.getPages();
         }
     },
 
diff --git a/resources/js/components/navigation/SiteSelector.vue b/resources/js/components/structures/SiteSelector.vue
similarity index 100%
rename from resources/js/components/navigation/SiteSelector.vue
rename to resources/js/components/structures/SiteSelector.vue
diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index 999e541a171..7ba3683b559 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -23,6 +23,7 @@
         structure-submit-url="{{ cp_route('collections.structure.update', $collection->handle()) }}"
         :structure-max-depth="{{ $structure->maxDepth() ?? 'Infinity' }}"
         :structure-expects-root="{{ Statamic\Support\Str::bool($structure->expectsRoot()) }}"
+        :structure-sites="{{ json_encode($structureSites) }}"
         @endif
     >
         <template #twirldown>
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 1febd2024bb..da0892df441 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -83,20 +83,13 @@ public function show(Request $request, $collection)
         return view('statamic::collections.show', array_merge($viewData, [
             'structure' => $structure,
             'expectsRoot' => $structure->expectsRoot(),
-            'localizations' => $structure->sites()->map(function ($handle) use ($structure, $tree) {
-                $localized = $structure->in($handle);
-                $exists = $localized !== null;
-                if (!$exists) {
-                    return null;
-                }
+            'structureSites' => $structure->trees()->map(function ($tree) {
                 return [
-                    'handle' => $handle,
-                    'name' => Site::get($handle)->name(),
-                    'active' => $handle === $tree->locale(),
-                    'exists' => $exists,
-                    'url' => $exists ? $localized->editUrl() : null,
+                    'handle' => $tree->locale(),
+                    'name' => $tree->site()->name(),
+                    'url' => $tree->showUrl(),
                 ];
-            })->filter()->all()
+            })->values()->all()
         ]));
     }
 

From ef53dc818f2e0ae4c62b8094a9e9319c91d08c6a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Mar 2020 13:22:54 -0400
Subject: [PATCH 101/137] Tidy

---
 resources/js/components/navigation/View.vue                 | 6 +-----
 src/Http/Controllers/CP/Structures/NavigationController.php | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 4722c82ce79..a3efe436ca2 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -18,7 +18,7 @@
                     v-if="sites.length > 1"
                     :sites="sites"
                     :value="site"
-                    @input="siteSelected"
+                    @input="window.location = $event.url"
                 />
 
                 <dropdown-list :show-dropdown-if="collections.length > 0">
@@ -253,10 +253,6 @@ export default {
                 this.showPageDeletionConfirmation = false;
                 this.pageBeingDeleted = branch;
             }
-        },
-
-        siteSelected(site) {
-            window.location = site.url;
         }
 
     }
diff --git a/src/Http/Controllers/CP/Structures/NavigationController.php b/src/Http/Controllers/CP/Structures/NavigationController.php
index 4602f99211e..2712cccc71c 100644
--- a/src/Http/Controllers/CP/Structures/NavigationController.php
+++ b/src/Http/Controllers/CP/Structures/NavigationController.php
@@ -81,7 +81,7 @@ public function show(Request $request, $nav)
             'nav' => $nav,
             'expectsRoot' => $nav->expectsRoot(),
             'collections' => $nav->collections()->map->handle()->all(),
-            'sites' => $nav->trees()->map(function ($tree) use ($nav) {
+            'sites' => $nav->trees()->map(function ($tree) {
                 return [
                     'handle' => $tree->locale(),
                     'name' => $tree->site()->name(),

From fceaf3d82ceeb99795ce680c6126de4df784b6fb Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Mar 2020 17:16:30 -0400
Subject: [PATCH 102/137] Tree tweaks ...

As part of (the collection structure's) tree validation, only entries from that site should get automatically appended. In order to do that, we need to query against the site.
This causes an infinite loop when it happens during the stache being loaded.

(In the validation, we query entries by site, it tries to populate the index, it needs to get the structure, it makes the structure from disk, it validates itself, and there's the infinite loop.)

To get around this, the validation is moved to the getter, and cached with Blink to get around the potentially performance hit.

When saving a collection, add or remove the appropriate trees depending on what sites are chosen.

When a collection structure requests a site's tree that it doesn't have in its tree list yet, just make it, assuming its allowed by the collection. Only navs need to explicitly exist. Collection structures should just work depending on what sites the collection has.

Entry files should be ignored if they're in a site subdirectory corresponding to one that the collection hasn't asked for.
---
 .../CP/Collections/CollectionsController.php  | 28 +++++++++++--------
 src/Stache/Stores/CollectionEntriesStore.php  | 18 ++++++++++--
 src/Structures/CollectionStructure.php        | 25 +++++++++++++++--
 src/Structures/Structure.php                  |  2 +-
 src/Structures/Tree.php                       | 12 +++++---
 .../Structures/CollectionStructureTest.php    |  7 +++--
 tests/Data/Structures/StructureTestCase.php   | 10 +++----
 tests/Data/Structures/TreeTest.php            | 27 ++++++++++++++----
 tests/Stache/Stores/EntriesStoreTest.php      |  6 ++++
 9 files changed, 101 insertions(+), 34 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index da0892df441..fe863cb8950 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -211,29 +211,35 @@ public function update(Request $request, $collection)
         if (! $values['structured']) {
             $collection->structure(null);
         } else {
-            $collection->structure($this->makeStructure($collection, $values['max_depth'], $values['expects_root']));
+            $collection->structure($this->makeStructure($collection, $values['max_depth'], $values['expects_root'], $values['sites']));
         }
 
+        // TODO: Temporary fix for if you add a site to a collection, and there are already entries
+        // in that site, when the stache index tries to update, it'll find those entries and
+        // throw an error because it wouldn't be in the entry store's paths array yet.
+        \Statamic\Facades\Stache::clear();
+
         $collection->save();
 
         return $collection->toArray();
     }
 
-    protected function makeStructure($collection, $maxDepth, $expectsRoot)
+    protected function makeStructure($collection, $maxDepth, $expectsRoot, $sites)
     {
         if (! $structure = $collection->structure()) {
             $structure = (new CollectionStructure)->collection($collection);
+        }
 
-            // todo: make multiple trees based on the existing multisite nature of the collection
-            $trees = [
-                Site::default()->handle() => $collection->queryEntries()->get('id')->map(function ($entry) {
-                    return ['entry' => $entry->id()];
-                })->all()
-            ];
+        foreach (Site::all() as $site) {
+            $site = $site->handle();
+            $shouldExist = in_array($site, $sites);
+
+            if ($shouldExist && !$structure->existsIn($site)) {
+                $structure->addTree($structure->makeTree($site));
+            }
 
-            foreach ($trees as $site => $contents) {
-                $tree = $structure->makeTree($site)->tree($contents);
-                $structure->addTree($tree);
+            if (!$shouldExist && $structure->existsIn($site)) {
+                $structure->removeTree($structure->in($site));
             }
         }
 
diff --git a/src/Stache/Stores/CollectionEntriesStore.php b/src/Stache/Stores/CollectionEntriesStore.php
index a1c4dc92a47..260667c2283 100644
--- a/src/Stache/Stores/CollectionEntriesStore.php
+++ b/src/Stache/Stores/CollectionEntriesStore.php
@@ -14,6 +14,13 @@
 
 class CollectionEntriesStore extends ChildStore
 {
+    protected $collection;
+
+    protected function collection()
+    {
+        return $this->collection ?? Collection::findByHandle($this->childKey);
+    }
+
     public function getFileFilter(SplFileInfo $file) {
         $dir = str_finish($this->directory(), '/');
         $relative = $file->getPathname();
@@ -22,6 +29,13 @@ public function getFileFilter(SplFileInfo $file) {
             $relative = substr($relative, strlen($dir));
         }
 
+        if (Site::hasMultiple()) {
+            [$site, $relative] = explode('/', $relative, 2);
+            if (! $this->collection()->sites()->contains($site)) {
+                return false;
+            }
+        }
+
         // if (! Collection::findByHandle(explode('/', $relative)[0])) {
         //     return false;
         // }
@@ -117,9 +131,9 @@ protected function removeEntryFromStructure($collection, $id)
 
         $contents = $collection->structureContents();
 
-        $trees = $contents['trees'] ?? [Site::default()->handle() => $contents['tree']];
+        $trees = $contents['tree'] ?? [Site::default()->handle() => $contents['tree']];
         unset($contents['tree']);
-        $contents['trees'] = $trees;
+        $contents['tree'] = $trees;
 
         $structure = (new CollectionStructure)
             ->collection($collection)
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
index aab378f5ac6..c35bc70760b 100644
--- a/src/Structures/CollectionStructure.php
+++ b/src/Structures/CollectionStructure.php
@@ -51,9 +51,9 @@ public function route(string $site): ?string
         return $this->collection->route($site);
     }
 
-    public function validateTree(array $tree): array
+    public function validateTree(array $tree, string $locale): array
     {
-        parent::validateTree($tree);
+        parent::validateTree($tree, $locale);
 
         $entryIds = $this->getEntryIdsFromTree($tree);
 
@@ -61,7 +61,10 @@ public function validateTree(array $tree): array
             throw new \Exception("Duplicate entry [{$entryId}] in [{$this->collection->handle()}] collection's structure.");
         }
 
-        $thisCollectionsEntries = $this->collection->queryEntries()->get('id')->map->id();
+        $thisCollectionsEntries = $this->collection->queryEntries()
+            ->where('site', $locale)
+            ->get(['id', 'site'])
+            ->map->id();
 
         $otherCollectionEntries = $entryIds->diff($thisCollectionsEntries);
 
@@ -95,4 +98,20 @@ public function save()
 
         return true;
     }
+
+    public function in($site)
+    {
+        if ($tree = parent::in($site)) {
+            return $tree;
+        }
+
+        if ($this->existsIn($site)) {
+            return $this->makeTree($site)->tree([]);
+        }
+    }
+
+    public function existsIn($site)
+    {
+        return $this->collection()->sites()->contains($site);
+    }
 }
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index 93cd486ac22..60e91b9d220 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -103,7 +103,7 @@ public function maxDepth($maxDepth = null)
             })->args(func_get_args());
     }
 
-    public function validateTree(array $tree): array
+    public function validateTree(array $tree, string $locale): array
     {
         if (! $this->expectsRoot()) {
             return $tree;
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 152b86f2153..1e4b0e96af3 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -5,6 +5,7 @@
 use Statamic\Contracts\Data\Localization;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
@@ -36,8 +37,11 @@ public function structure($structure = null)
     public function tree($tree = null)
     {
         return $this->fluentlyGetOrSet('tree')
-            ->setter(function ($tree) {
-                return $this->structure->validateTree($tree);
+            ->getter(function ($tree)  {
+                $key = "structure-{$this->structure->handle()}-{$this->locale()}-" . md5(json_encode($tree));
+                return Blink::once($key, function () use ($tree) {
+                    return $this->structure->validateTree($tree, $this->locale());
+                });
             })
             ->args(func_get_args());
     }
@@ -48,7 +52,7 @@ public function root()
             return null;
         }
 
-        return $this->tree[0]['entry'];
+        return $this->tree()[0]['entry'];
     }
 
     public function handle()
@@ -86,7 +90,7 @@ public function parent()
 
     public function pages()
     {
-        $pages = $this->tree;
+        $pages = $this->tree();
 
         if ($this->root()) {
             $pages = array_slice($pages, 1);
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
index a6a78d55340..85393201f8d 100644
--- a/tests/Data/Structures/CollectionStructureTest.php
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -14,6 +14,7 @@ public function setUp(): void
         parent::setUp();
 
         $this->entryQueryBuilder = $this->mock(EntryQueryBuilder::class);
+        $this->entryQueryBuilder->shouldReceive('where')->with('site', 'en')->andReturnSelf();
         $this->entryQueryBuilder->shouldReceive('get')->andReturnUsing(function () {
             return $this->queryBuilderGetReturnValue();
         });
@@ -141,7 +142,7 @@ function entries_may_only_appear_in_the_tree_once()
                         ]
                     ]
                 ]
-            ]);
+            ], 'en');
     }
 
     /** @test */
@@ -176,7 +177,7 @@ function only_entries_belonging_to_the_associated_collection_may_be_in_the_tree(
                 ]
             ],
             ['entry' => '3'],
-        ]);
+        ], 'en');
     }
 
     /** @test */
@@ -198,7 +199,7 @@ function entries_not_explicitly_in_the_tree_should_be_appended_to_the_end_of_the
                 ]
             ],
             ['entry' => '3'],
-        ]);
+        ], 'en');
 
         $expected = [
             [
diff --git a/tests/Data/Structures/StructureTestCase.php b/tests/Data/Structures/StructureTestCase.php
index 569ef4c7041..d496dc58b4a 100644
--- a/tests/Data/Structures/StructureTestCase.php
+++ b/tests/Data/Structures/StructureTestCase.php
@@ -29,7 +29,7 @@ function the_tree_root_cannot_have_children_when_expecting_root()
                     ]
                 ]
             ]
-        ]);
+        ], 'en');
     }
 
     /** @test */
@@ -46,7 +46,7 @@ function the_tree_root_can_have_children_when_not_expecting_root()
             ]
         ];
 
-        $this->assertEquals($tree, $this->structure()->expectsRoot(false)->validateTree($tree));
+        $this->assertEquals($tree, $this->structure()->expectsRoot(false)->validateTree($tree, 'en'));
     }
 
     /** @test */
@@ -60,13 +60,13 @@ function the_root_must_be_an_entry_when_expecting_root()
                 'title' => 'Not an entry',
                 'url' => '/test',
             ]
-        ]);
+        ], 'en');
     }
 
     /** @test */
     function the_root_doesnt_need_to_be_an_entry_if_the_tree_is_empty()
     {
-        $this->assertEquals([], $this->structure()->expectsRoot(true)->validateTree([]));
+        $this->assertEquals([], $this->structure()->expectsRoot(true)->validateTree([], 'en'));
     }
 
     /** @test **/
@@ -79,6 +79,6 @@ function the_root_doesnt_need_to_be_an_entry_when_not_expecting_root()
             ]
         ];
 
-        $this->assertEquals($tree, $this->structure()->expectsRoot(false)->validateTree($tree));
+        $this->assertEquals($tree, $this->structure()->expectsRoot(false)->validateTree($tree, 'en'));
     }
 }
diff --git a/tests/Data/Structures/TreeTest.php b/tests/Data/Structures/TreeTest.php
index 4402602f967..3c19212f569 100644
--- a/tests/Data/Structures/TreeTest.php
+++ b/tests/Data/Structures/TreeTest.php
@@ -291,17 +291,34 @@ function it_fixes_indexes_when_moving()
     }
 
     /** @test */
-    function the_structure_validates_the_tree_when_setting_it()
+    function the_structure_validates_the_tree_when_getting_it_the_first_time()
     {
         $structure = $this->mock(Structure::class);
+        $structure->shouldReceive('handle')->andReturn('test');
 
-        $treeContents = ['the' => 'tree'];
+        $firstContents = ['first' => 'time'];
+        $secondContents = ['second' => 'time'];
 
-        $structure->shouldReceive('validateTree')->with($treeContents)->once()->andReturn($treeContents);
+        $structure->shouldReceive('validateTree')->with($firstContents, 'the-locale')->once()->andReturn($firstContents);
+        $structure->shouldReceive('validateTree')->with($secondContents, 'the-locale')->once()->andReturn($secondContents);
 
-        $tree = (new Tree)->structure($structure);
+        $tree = (new Tree)->structure($structure)->locale('the-locale');
+
+        // Calling tree multiple times doesn't re-validate
+        $tree->tree($firstContents);
+        $tree->tree();
+        $tree->tree();
+
+        // Re-setting the tree exactly the same also won't re-validate
+        $tree->tree($firstContents);
+        $tree->tree();
 
-        $tree->tree($treeContents);
+        // Using different contents will re-validate.
+        $tree->tree($secondContents);
+        $tree->tree();
+        $tree->tree($secondContents);
+        $tree->tree();
+        $tree->tree();
     }
 
     protected function tree()
diff --git a/tests/Stache/Stores/EntriesStoreTest.php b/tests/Stache/Stores/EntriesStoreTest.php
index d38c7452157..69549d7a6cf 100644
--- a/tests/Stache/Stores/EntriesStoreTest.php
+++ b/tests/Stache/Stores/EntriesStoreTest.php
@@ -129,4 +129,10 @@ function it_saves_to_disk()
         @unlink($path);
         $this->assertFileNotExists($path);
     }
+
+    /** @test */
+    function it_ignores_entries_in_a_site_subdirectory_where_the_collection_doesnt_have_that_site_enabled()
+    {
+        $this->markTestIncomplete();
+    }
 }

From 1b65df1e943ccf26884803f4e8daf1446d6c1826 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 09:53:36 -0400
Subject: [PATCH 103/137] Fix structure box on getting started widget. Empty
 the translation so it's obvious it needs to be updated later.

---
 resources/lang/de/messages.php                    | 2 +-
 resources/lang/en/messages.php                    | 2 +-
 resources/lang/es/messages.php                    | 2 +-
 resources/lang/fr/messages.php                    | 2 +-
 resources/lang/it/messages.php                    | 2 +-
 resources/lang/pt/messages.php                    | 2 +-
 resources/views/widgets/getting-started.blade.php | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
index bc8d69d4f47..89ac334b087 100644
--- a/resources/lang/de/messages.php
+++ b/resources/lang/de/messages.php
@@ -102,7 +102,7 @@
     'getting_started_widget_docs' => 'Lernen Sie Statamic richtig kennen.',
     'getting_started_widget_header' => 'Erste Schritte mit Statamic',
     'getting_started_widget_intro' => 'Um mit der Erstellung Ihrer neuen Statamic-Site zu beginnen, empfehlen wir, mit diesen Schritten zu beginnen.',
-    'getting_started_widget_structures' => 'Strukturen legen die Hierarchie Ihrer Seite fest und unterstützen Sie bei der Verwaltung Ihrer Seiten-Navigation.',
+    'getting_started_widget_navigation' => '',
     'global_search_open_using_slash' => 'Sie können die globale Suche mit der Taste <kbd>/</kbd> öffnen',
     'global_set_blueprint_instructions' => 'Definiert das Feldlayout bei der Bearbeitung des globalen Sets.',
     'global_set_handle_instructions' => 'Wie sie das globale Set in Vorlagen usw. referenzieren.',
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 05d4b4bf860..8665b473a5e 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -106,7 +106,7 @@
     'getting_started_widget_docs' => 'Get to know Statamic by understanding its capabilities the right way.',
     'getting_started_widget_header' => 'Getting Started with Statamic',
     'getting_started_widget_intro' => 'To begin building your new Statamic site, we recommend starting with these steps.',
-    'getting_started_widget_structures' => 'Structures establish the hierarchy of your pages and help you manage your site navigation.',
+    'getting_started_widget_navigation' => '',
     'global_search_open_using_slash' => 'You can open global search using the <kbd>/</kbd> key',
     'global_set_blueprint_instructions' => 'Defines the field layout when editing this global set.',
     'global_set_handle_instructions' => 'How you will reference this global set in templates, etc.',
diff --git a/resources/lang/es/messages.php b/resources/lang/es/messages.php
index 9c508789da5..8f0f37b34f2 100644
--- a/resources/lang/es/messages.php
+++ b/resources/lang/es/messages.php
@@ -102,7 +102,7 @@
     'getting_started_widget_docs' => 'Conoce Statamic, comprende sus capacidades de la manera correcta.',
     'getting_started_widget_header' => 'Empezando con Statamic',
     'getting_started_widget_intro' => 'Para comenzar a construir tu nuevo sitio en Statamic, te recomendamos empezar con estos pasos.',
-    'getting_started_widget_structures' => 'Las estructuras establecen la jerarquía de tus páginas y te ayudan a administrar la navegación de su sitio.',
+    'getting_started_widget_navigation' => '',
     'global_search_open_using_slash' => 'Puedes abrir la búsqueda global con la tecla <kbd>/</kbd>',
     'global_set_blueprint_instructions' => 'Define el diseño del campo al editar este conjunto global.',
     'global_set_handle_instructions' => 'Cómo harás referencia a este conjunto global en plantillas, etc.',
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index 35152df0897..b7560d453cc 100644
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -102,7 +102,7 @@
     'getting_started_widget_docs' => 'Apprenez à connaître Statamic pour bien comprendre ses capacités.',
     'getting_started_widget_header' => 'Débuter avec Statamic',
     'getting_started_widget_intro' => 'Pour commencer à construire votre nouveau site Statamic, nous vous recommandons de commencer par ces étapes.',
-    'getting_started_widget_structures' => 'Les structures établissent la hiérarchie de vos pages et vous aident à gérer la navigation de votre site.',
+    'getting_started_widget_navigation' => '',
     'global_search_open_using_slash' => 'Vous pouvez ouvrir la recherche globale en utilisant la touche <kbd>/</kbd>',
     'global_set_blueprint_instructions' => 'Définit la disposition du champ lors de la modification de ce jeu de globales.',
     'global_set_handle_instructions' => 'Comment vous allez référencer ce jeu de globales dans les modèles, etc.',
diff --git a/resources/lang/it/messages.php b/resources/lang/it/messages.php
index 6ccb85a397f..c34acd1d7a2 100644
--- a/resources/lang/it/messages.php
+++ b/resources/lang/it/messages.php
@@ -102,7 +102,7 @@
     'getting_started_widget_docs' => 'Conosci Statamic capendo le sue capacità nel modo giusto.',
     'getting_started_widget_header' => 'Introduzione a Statamic',
     'getting_started_widget_intro' => 'Per iniziare a costruire il tuo nuovo sito Statamic, ti consigliamo di iniziare con questi passaggi.',
-    'getting_started_widget_structures' => 'Le strutture stabiliscono la gerarchia delle tue pagine e ti aiutano a gestire la navigazione del tuo sito.',
+    'getting_started_widget_navigation' => '',
     'global_search_open_using_slash' => 'Puoi aprire la ricerca globale usando il tasto <kbd>/</kbd>',
     'global_set_blueprint_instructions' => 'Definisce il layout del campo durante la modifica di questo set globale.',
     'global_set_handle_instructions' => 'Come farai riferimento a questo set globale in modelli, ecc.',
diff --git a/resources/lang/pt/messages.php b/resources/lang/pt/messages.php
index 26b331b1a63..0f0e3509274 100644
--- a/resources/lang/pt/messages.php
+++ b/resources/lang/pt/messages.php
@@ -102,7 +102,7 @@
     'getting_started_widget_docs' => 'Conheça o Statamic compreendendo suas capacidades da maneira certa.',
     'getting_started_widget_header' => 'Introdução ao Statamic',
     'getting_started_widget_intro' => 'Para começar a criar seu novo site Statamic, recomendamos começar com estas etapas.',
-    'getting_started_widget_structures' => 'Estruturas estabelecem a hierarquia de suas páginas e ajudam a gerir a navegação no site.',
+    'getting_started_widget_navigation' => '',
     'global_search_open_using_slash' => 'Pode abrir a pesquisa global usando a tecla <kbd>/</kbd>',
     'global_set_blueprint_instructions' => 'Define o layout do campo ao editar este conjunto global.',
     'global_set_handle_instructions' => 'Como fará referência a este conjunto global em modelos, etc..',
diff --git a/resources/views/widgets/getting-started.blade.php b/resources/views/widgets/getting-started.blade.php
index a57153d0e96..93d4ea42601 100644
--- a/resources/views/widgets/getting-started.blade.php
+++ b/resources/views/widgets/getting-started.blade.php
@@ -39,9 +39,9 @@
             <div class="h-8 w-8 mr-2 hidden md:block text-blue">
                 @svg('structures')
             </div>
-            <a href="{{ cp_route('structures.create') }}" class="flex-1 mb-2 md:mb-0 md:mr-3">
-                <h3 class="mb-1 text-blue group-hover:text-grey-80">{{ __('Create a Structure') }} &rarr;</h3>
-                <p>{{ __('statamic::messages.getting_started_widget_structures') }}</p>
+            <a href="{{ cp_route('navigation.create') }}" class="flex-1 mb-2 md:mb-0 md:mr-3">
+                <h3 class="mb-1 text-blue group-hover:text-grey-80">{{ __('Create a Navigation') }} &rarr;</h3>
+                <p>{{ __('statamic::messages.getting_started_widget_navigation') }}</p>
             </a>
         </div>
     </div>

From 3f53408e1996e9d86654cb72449e072cb1404ba6 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 09:59:36 -0400
Subject: [PATCH 104/137] Link to the nav's showUrl ...

rather than the selected site's tree.

It's possible that the nav doesn't exist for the selected site, which would cause an error.
We could filter it out of the listing, but then you just wouldn't see it.

Better to just show all the navs. When you visit the showUrl, it will redirect appropriately.
---
 src/Http/Controllers/CP/Structures/NavigationController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Http/Controllers/CP/Structures/NavigationController.php b/src/Http/Controllers/CP/Structures/NavigationController.php
index 2712cccc71c..5aa8a87c12f 100644
--- a/src/Http/Controllers/CP/Structures/NavigationController.php
+++ b/src/Http/Controllers/CP/Structures/NavigationController.php
@@ -24,12 +24,10 @@ public function index()
         $navs = Nav::all()->filter(function ($nav) {
             return User::current()->can('view', $nav);
         })->map(function ($structure) {
-            $tree = $structure->in(Site::selected()->handle());
-
             return [
                 'id' => $structure->handle(),
                 'title' => $structure->title(),
-                'show_url' => $tree->showUrl(),
+                'show_url' => $structure->showUrl(),
                 'edit_url' => $structure->editUrl(),
                 'delete_url' => $structure->deleteUrl(),
                 'deleteable' => User::current()->can('delete', $structure)

From de77f9fb54ac96800f808ae03bb915b865e38cf3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 10:14:45 -0400
Subject: [PATCH 105/137] window isnt available there

---
 resources/js/components/navigation/View.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index a3efe436ca2..4722c82ce79 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -18,7 +18,7 @@
                     v-if="sites.length > 1"
                     :sites="sites"
                     :value="site"
-                    @input="window.location = $event.url"
+                    @input="siteSelected"
                 />
 
                 <dropdown-list :show-dropdown-if="collections.length > 0">
@@ -253,6 +253,10 @@ export default {
                 this.showPageDeletionConfirmation = false;
                 this.pageBeingDeleted = branch;
             }
+        },
+
+        siteSelected(site) {
+            window.location = site.url;
         }
 
     }

From 5f14dcef005d1d95949a819c6fc9028a1eb39f6a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 10:20:05 -0400
Subject: [PATCH 106/137] Move empty state to a slot

---
 resources/js/components/navigation/View.vue     | 11 +++++++++++
 resources/js/components/structures/PageTree.vue |  9 +--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 4722c82ce79..958ebb09aa6 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -51,6 +51,17 @@
             @saved="changed = false"
             @canceled="changed = false"
         >
+            <template #empty>
+                <div class="text-center max-w-md mx-auto rounded-lg px-4 py-4">
+                    <svg-icon name="empty/structure" class="w-24 h-auto mx-auto" />
+                    <h1 class="my-3" v-text="__('Create your first link now')" />
+                    <p class="text-grey mb-3">
+                        {{ __('messages.structures_empty') }}
+                    </p>
+                    <button class="btn-primary btn-lg" v-text="__('Create first link')" @click="openPageCreator" />
+                </div>
+            </template>
+
             <template #branch-icon="{ branch }">
                 <svg-icon v-if="isEntryBranch(branch)" class="inline-block w-4 h-4 text-grey-50" name="hyperlink" v-tooltip="__('Entry link')" />
                 <svg-icon v-if="isLinkBranch(branch)" class="inline-block w-4 h-4 text-grey-50" name="external-link" v-tooltip="__('External link')" />
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 763ce3c5b34..0ced538230b 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -6,14 +6,7 @@
         </div>
 
         <div v-if="!loading && pages.length == 0" class="no-results border-dashed border-2 w-full flex items-center">
-            <div class="text-center max-w-md mx-auto rounded-lg px-4 py-4">
-                <svg-icon name="empty/structure" class="w-24 h-auto mx-auto" />
-                <h1 class="my-3" v-text="__('Create your first link now')" />
-                <p class="text-grey mb-3">
-                    {{ __('messages.structures_empty') }}
-                </p>
-                <button class="btn-primary btn-lg" v-text="__('Create first link')" @click="openPageCreator" />
-            </div>
+            <slot name="empty" />
         </div>
 
         <div v-if="!loading" class="page-tree w-full">

From 1644a5f7e1b0e99621388ec5473328cce6f9fad1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 10:20:12 -0400
Subject: [PATCH 107/137] Remove old stuff

---
 resources/js/components/structures/PageTree.vue | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index 0ced538230b..6147fafa01e 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -82,7 +82,6 @@ export default {
             pages: [],
             treeData: [],
             pageIds: [],
-            parentPageForAdding: null,
             soundDropUrl: this.$config.get('resourceUrl') + '/audio/click.mp3',
         }
     },
@@ -258,22 +257,9 @@ export default {
             });
         },
 
-        linkChildPage(vm) {
-            this.parentPageForAdding = vm;
-            this.openPageCreator();
-        },
-
         pageUpdated(tree) {
             this.pages = tree.getPureData();
             this.$emit('changed');
-        },
-
-        makeFirstPage() {
-            if (this.hasCollection) {
-                return window.location = this.createUrl
-            } else {
-                this.openPageCreator()
-            }
         }
 
     }

From e08e1c9b6f05af5ff5f1ed11d004572199293b1b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 11:42:51 -0400
Subject: [PATCH 108/137] Support the "from" parameter on the nav tag when
 using a collection

---
 src/Structures/TreeBuilder.php | 23 +++++++++++++++++++----
 src/Tags/Nav.php               |  2 +-
 src/Tags/Structure.php         |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/Structures/TreeBuilder.php b/src/Structures/TreeBuilder.php
index 028282f5a9f..1bad6dca681 100644
--- a/src/Structures/TreeBuilder.php
+++ b/src/Structures/TreeBuilder.php
@@ -2,8 +2,10 @@
 
 namespace Statamic\Structures;
 
-use Statamic\Support\Arr;
+use Statamic\Contracts\Structures\Nav;
+use Statamic\Facades\Entry;
 use Statamic\Facades\Structure;
+use Statamic\Support\Arr;
 
 class TreeBuilder
 {
@@ -13,13 +15,26 @@ public function build($params)
             return null;
         }
 
+        $from = $params['from'] ?? null;
+
+        if ($from && $structure instanceof Nav) {
+            throw new \Exception('Cannot get a nested starting position on a navigation structure.');
+        }
+
         if (! $tree = $structure->in($params['site'])) {
             return null;
         }
 
-        $pages = $tree->pages()
-            ->prependParent(Arr::get($params, 'include_home'))
-            ->all();
+        if ($from) {
+            $entry = Entry::findByUri($from);
+            $page = $tree->page($entry->id());
+            $pages = $page->pages()->all();
+        } else {
+            $pages = $tree->pages()
+                ->prependParent(Arr::get($params, 'include_home'))
+                ->all();
+        }
+
 
         return $this->toTree($pages, 1);
     }
diff --git a/src/Tags/Nav.php b/src/Tags/Nav.php
index 36d39d1df6b..2fdaecb6bcc 100644
--- a/src/Tags/Nav.php
+++ b/src/Tags/Nav.php
@@ -6,6 +6,6 @@ class Nav extends Structure
 {
     public function index()
     {
-        return $this->structure($this->get('from', 'collection::pages'));
+        return $this->structure($this->get('handle', 'collection::pages'));
     }
 }
diff --git a/src/Tags/Structure.php b/src/Tags/Structure.php
index c197b36f804..c5bdab01263 100644
--- a/src/Tags/Structure.php
+++ b/src/Tags/Structure.php
@@ -28,6 +28,7 @@ protected function structure($handle)
             'structure' => $handle,
             'include_home' => $this->get('include_home'),
             'site' => $this->get('site', Site::current()->handle()),
+            'from' => $this->get('from'),
         ]);
 
         return $this->toArray($tree);

From a9cda4971340fe924fac0865ec05c53f09087855 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 11:50:25 -0400
Subject: [PATCH 109/137] Reset the structure appropriately when setting

---
 src/Entries/Collection.php            |  4 ++--
 tests/Data/Entries/CollectionTest.php | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index c617a78566d..ea956ef0ec5 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -480,9 +480,8 @@ public function structure($structure = null)
             ->setter(function ($structure) {
                 if ($structure) {
                     $structure->collection($this);
-                } else {
-                    $this->structureContents = null;
                 }
+                $this->structureContents = null;
                 Blink::forget("collection-{$this->id()}-structure");
                 return $structure;
             })
@@ -495,6 +494,7 @@ public function structureContents(array $contents = null)
             ->fluentlyGetOrSet('structureContents')
             ->setter(function ($contents) {
                 Blink::forget("collection-{$this->id()}-structure");
+                $this->structure = null;
                 return $contents;
             })
             ->args(func_get_args());
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index f4bb1ecaabe..e22e627121e 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -387,6 +387,33 @@ function it_sets_the_structure_inline()
         $this->assertEquals(2, $structure->maxDepth());
     }
 
+    /** @test */
+    function setting_a_structure_removes_the_existing_inline_structure()
+    {
+        $collection = (new Collection)->handle('test');
+        $collection->structureContents($contents = ['tree' => []]);
+        $this->assertSame($contents, $collection->structureContents());
+
+        $collection->structure(new CollectionStructure);
+
+        $this->assertNull($collection->structureContents());
+    }
+
+    /** @test */
+    function setting_an_inline_structure_removes_the_existing_structure()
+    {
+        $collection = (new Collection)->handle('test');
+        $collection->structure($structure = (new CollectionStructure)->maxDepth(2));
+        $this->assertSame($structure, $collection->structure());
+        $this->assertEquals(2, $collection->structure()->maxDepth());
+        $this->assertNull($collection->structureContents());
+
+        $collection->structureContents(['max_depth' => 13, 'tree' => []]);
+
+        $this->assertNotSame($structure, $collection->structure());
+        $this->assertEquals(13, $collection->structure()->maxDepth());
+    }
+
     private function makeStructure()
     {
         return (new CollectionStructure)->tap(function ($s) {

From 010ccc45b42792d6f3ec11e5c9fea3b1843cc40d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 12:12:55 -0400
Subject: [PATCH 110/137] Remove the fix ...

It was causing problems when saving. Messing up the collection references within the collection's structure. Since the stache was empty, sometimes where it needed to find the collection it would pull a fresh one, which would contain the existing structure defined in the file and things would be confused.

The multisite issue is still there, but is less of a priority. It only breaks for a moment.
---
 .../Controllers/CP/Collections/CollectionsController.php     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index fe863cb8950..336c32562e0 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -214,11 +214,6 @@ public function update(Request $request, $collection)
             $collection->structure($this->makeStructure($collection, $values['max_depth'], $values['expects_root'], $values['sites']));
         }
 
-        // TODO: Temporary fix for if you add a site to a collection, and there are already entries
-        // in that site, when the stache index tries to update, it'll find those entries and
-        // throw an error because it wouldn't be in the entry store's paths array yet.
-        \Statamic\Facades\Stache::clear();
-
         $collection->save();
 
         return $collection->toArray();

From 84281e437c2af4e40948957dcecfa49c64166144 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 12:16:32 -0400
Subject: [PATCH 111/137] A collection with multiple sites, but only one tree
 defined in the yaml structure, would not have a site switcher ...

The sites array defines whether the structure should have the trees, not the trees object itself.
Later, the trees() method could be smarter and return all the site trees even if not explicitly added, but this is fine for now.
---
 src/Http/Controllers/CP/Collections/CollectionsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 336c32562e0..debb838e3fd 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -78,12 +78,12 @@ public function show(Request $request, $collection)
         }
 
         $structure = $collection->structure();
-        $tree = $structure->in($site->handle());
 
         return view('statamic::collections.show', array_merge($viewData, [
             'structure' => $structure,
             'expectsRoot' => $structure->expectsRoot(),
-            'structureSites' => $structure->trees()->map(function ($tree) {
+            'structureSites' => $collection->sites()->map(function ($site) use ($structure) {
+                $tree = $structure->in($site);
                 return [
                     'handle' => $tree->locale(),
                     'name' => $tree->site()->name(),

From 760034803fb7c5d8900bf1c02a40785cf5c48e4d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 15:58:01 -0400
Subject: [PATCH 112/137] Redirect field can select entry

---
 .../fieldtypes/RedirectFieldtype.vue          | 28 ++++++++++++++++++-
 src/Fieldtypes/Redirect.php                   | 17 +++++++++++
 src/Routing/ResolveRedirect.php               |  7 +++++
 tests/Routing/ResolveRedirectTest.php         | 12 ++++++++
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
index 5b08ca4c6c0..37186e1126a 100644
--- a/resources/js/components/fieldtypes/RedirectFieldtype.vue
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -17,6 +17,16 @@
                 v-if="enabled && option === 'url'"
                 :value="value"
                 @input="update($event)" />
+
+            <relationship-fieldtype
+                v-if="enabled && option === 'entry'"
+                handle="entry"
+                :value="entriesValue"
+                :config="meta.entry.config"
+                :meta="meta.entry.meta"
+                @input="entriesSelected"
+            />
+
         </div>
     </div>
 </template>
@@ -33,7 +43,9 @@ export default {
             options: [
                 {label: 'URL', value: 'url'},
                 {label: 'First Child', value: 'first-child'},
-            ]
+                {label: 'Entry', value: 'entry'}
+            ],
+            entriesValue: [],
         }
     },
 
@@ -59,9 +71,23 @@ export default {
             this.option = 'first-child';
         }
 
+        if (this.value && this.value.startsWith('entry::')) {
+            this.option = 'entry';
+            this.entriesValue = [this.value.substr(7)];
+        }
+
         if (this.config.required) {
             this.enabled = true;
         }
+    },
+
+    methods: {
+
+        entriesSelected(entries) {
+            this.entriesValue = entries;
+            this.update('entry::' + entries[0]);
+        }
+
     }
 
 }
diff --git a/src/Fieldtypes/Redirect.php b/src/Fieldtypes/Redirect.php
index 8f988ce73f3..e095e5ee9e6 100644
--- a/src/Fieldtypes/Redirect.php
+++ b/src/Fieldtypes/Redirect.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Fieldtypes;
 
+use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Routing\ResolveRedirect;
 
@@ -11,4 +12,20 @@ public function augment($value)
     {
         return (new ResolveRedirect)($value, $this->field->parent());
     }
+
+    public function preload()
+    {
+        $entryFieldtype = (new Field('entry', [
+            'type' => 'entries',
+            'max_items' => 1,
+            'create' => false,
+        ]))->fieldtype();
+
+        return [
+            'entry' => [
+                'config' => $entryFieldtype->config(),
+                'meta' => $entryFieldtype->preload(),
+            ]
+        ];
+    }
 }
diff --git a/src/Routing/ResolveRedirect.php b/src/Routing/ResolveRedirect.php
index 0249ad4a7a8..a8435cd1d6c 100644
--- a/src/Routing/ResolveRedirect.php
+++ b/src/Routing/ResolveRedirect.php
@@ -3,7 +3,9 @@
 namespace Statamic\Routing;
 
 use Statamic\Contracts\Entries\Entry;
+use Statamic\Facades;
 use Statamic\Structures\Page;
+use Statamic\Support\Str;
 
 class ResolveRedirect
 {
@@ -13,6 +15,11 @@ public function __invoke($redirect, $parent = null)
             $redirect = $this->firstChildUrl($parent);
         }
 
+        if (Str::startsWith($redirect, 'entry::')) {
+            $id = Str::after($redirect, 'entry::');
+            $redirect = Facades\Entry::find($id)->url();
+        }
+
         return is_numeric($redirect) ? (int) $redirect : $redirect;
     }
 
diff --git a/tests/Routing/ResolveRedirectTest.php b/tests/Routing/ResolveRedirectTest.php
index b24110e0007..a26d656acee 100644
--- a/tests/Routing/ResolveRedirectTest.php
+++ b/tests/Routing/ResolveRedirectTest.php
@@ -6,6 +6,7 @@
 use PHPUnit\Framework\TestCase;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Routing\ResolveRedirect;
+use Statamic\Facades;
 use Statamic\Structures\Page;
 use Statamic\Structures\Pages;
 
@@ -98,4 +99,15 @@ function a_parent_without_a_child_resolves_to_a_404()
 
         $this->assertEquals('404', $resolver('@child', $parent));
     }
+
+    /** @test */
+    function it_resolves_references_to_entries()
+    {
+        $resolver = new ResolveRedirect;
+
+        $entry = Mockery::mock(Entry::class)->shouldReceive('url')->once()->andReturn('/the-entry')->getMock();
+        Facades\Entry::shouldReceive('find')->with('123')->once()->andReturn($entry);
+
+        $this->assertEquals('/the-entry', $resolver('entry::123'));
+    }
 }

From 032fbc5eb62dc44162ecf5fff33b3940df476777 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 16:33:46 -0400
Subject: [PATCH 113/137] Remove the entry value when changing option

---
 resources/js/components/fieldtypes/RedirectFieldtype.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
index 37186e1126a..600b46d7134 100644
--- a/resources/js/components/fieldtypes/RedirectFieldtype.vue
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -54,6 +54,11 @@ export default {
             if (option === 'first-child') {
                 this.update('@child');
             }
+
+            if (oldOption === 'entry') {
+                this.entriesValue = [];
+                this.update(null);
+            }
         },
 
         enabled(enabled) {

From 6fcbbd25b0eee7b83cb32f31f4c18ba8c41e889c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 16:34:02 -0400
Subject: [PATCH 114/137] Automatically open the selector when changing to
 entries

---
 resources/js/components/fieldtypes/RedirectFieldtype.vue     | 5 +++++
 .../fieldtypes/relationship/RelationshipFieldtype.vue        | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
index 600b46d7134..425304b5f27 100644
--- a/resources/js/components/fieldtypes/RedirectFieldtype.vue
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -20,6 +20,7 @@
 
             <relationship-fieldtype
                 v-if="enabled && option === 'entry'"
+                ref="entries"
                 handle="entry"
                 :value="entriesValue"
                 :config="meta.entry.config"
@@ -59,6 +60,10 @@ export default {
                 this.entriesValue = [];
                 this.update(null);
             }
+
+            if (option === 'entry') {
+                setTimeout(() => this.$refs.entries.linkExistingItem(), 100);
+            }
         },
 
         enabled(enabled) {
diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index 49bd7804fea..a2205c47943 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -1,6 +1,7 @@
 <template>
 
     <relationship-input
+        ref="input"
         :name="name"
         :value="value"
         :mode="config.mode"
@@ -140,6 +141,10 @@ export default {
             const meta = clone(this.meta);
             meta.data = data;
             this.updateMeta(meta);
+        },
+
+        linkExistingItem() {
+            this.$refs.input.$refs.existing.click();
         }
 
     }

From c856f3d50111e8c541c6484e82ee0a98f7843f23 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 16:37:02 -0400
Subject: [PATCH 115/137] Save null when no entry is selected

---
 resources/js/components/fieldtypes/RedirectFieldtype.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
index 425304b5f27..48581e75c03 100644
--- a/resources/js/components/fieldtypes/RedirectFieldtype.vue
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -95,7 +95,7 @@ export default {
 
         entriesSelected(entries) {
             this.entriesValue = entries;
-            this.update('entry::' + entries[0]);
+            this.update(entries.length ? 'entry::' + entries[0] : null);
         }
 
     }

From 4d1ea7ac25c7d1cb9b8939b83c7324c31e24b6d5 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 12 Mar 2020 16:46:34 -0400
Subject: [PATCH 116/137] Make it a regular test case to fix facades

---
 tests/Routing/ResolveRedirectTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Routing/ResolveRedirectTest.php b/tests/Routing/ResolveRedirectTest.php
index a26d656acee..36e46756413 100644
--- a/tests/Routing/ResolveRedirectTest.php
+++ b/tests/Routing/ResolveRedirectTest.php
@@ -3,12 +3,12 @@
 namespace Tests\Routing;
 
 use Mockery;
-use PHPUnit\Framework\TestCase;
 use Statamic\Contracts\Entries\Entry;
-use Statamic\Routing\ResolveRedirect;
 use Statamic\Facades;
+use Statamic\Routing\ResolveRedirect;
 use Statamic\Structures\Page;
 use Statamic\Structures\Pages;
+use Tests\TestCase;
 
 class ResolveRedirectTest extends TestCase
 {

From ca47f56bd970f18f70b5fb2c2605138b31ee2297 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Mar 2020 10:18:05 -0400
Subject: [PATCH 117/137] Use new btn-group style

---
 resources/js/components/collections/View.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 6fc994aa308..ffa08661664 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -13,11 +13,11 @@
                     <slot name="twirldown" />
                 </dropdown-list>
 
-                <div class="btn-group-flat mr-2" v-if="canUseStructureTree && !treeIsDirty">
-                    <button @click="view = 'tree'" :class="{'active': view === 'tree'}">
+                <div class="btn-group mr-2" v-if="canUseStructureTree && !treeIsDirty">
+                    <button class="btn-flat" @click="view = 'tree'" :class="{'active': view === 'tree'}">
                         <svg-icon name="structures" class="h-4 w-4"/>
                     </button>
-                    <button @click="view = 'list'" :class="{'active': view === 'list'}">
+                    <button class="btn-flat" @click="view = 'list'" :class="{'active': view === 'list'}">
                         <svg-icon name="assets-mode-table" class="h-4 w-4" />
                     </button>
                 </div>

From aaf11621031cb85cc883c522a73b730fa4e7f101 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Mar 2020 10:20:27 -0400
Subject: [PATCH 118/137] Uniform padding

---
 resources/js/components/collections/View.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index ffa08661664..16147db552e 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -14,10 +14,10 @@
                 </dropdown-list>
 
                 <div class="btn-group mr-2" v-if="canUseStructureTree && !treeIsDirty">
-                    <button class="btn-flat" @click="view = 'tree'" :class="{'active': view === 'tree'}">
+                    <button class="btn-flat px-2" @click="view = 'tree'" :class="{'active': view === 'tree'}">
                         <svg-icon name="structures" class="h-4 w-4"/>
                     </button>
-                    <button class="btn-flat" @click="view = 'list'" :class="{'active': view === 'list'}">
+                    <button class="btn-flat px-2" @click="view = 'list'" :class="{'active': view === 'list'}">
                         <svg-icon name="assets-mode-table" class="h-4 w-4" />
                     </button>
                 </div>

From c97f65ea9beee472d49073e8c5859921ffa1a528 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Mar 2020 11:16:56 -0400
Subject: [PATCH 119/137] Bring back old store class, deprecated, to prevent an
 error to ease migration

---
 src/Stache/Stores/StructuresStore.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/Stache/Stores/StructuresStore.php

diff --git a/src/Stache/Stores/StructuresStore.php b/src/Stache/Stores/StructuresStore.php
new file mode 100644
index 00000000000..52d1a8389a6
--- /dev/null
+++ b/src/Stache/Stores/StructuresStore.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Stache\Stores;
+
+/**
+ * Exists only to ease migration from structures to navigation in beta 20
+ *
+ * @deprecated
+ **/
+class StructuresStore extends NavigationStore
+{
+    //
+}

From 905f74cb96f5a054379074d6cbf02b6ad079b6e2 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Mar 2020 13:44:28 -0400
Subject: [PATCH 120/137] Remove old routes fieldtype

---
 resources/js/bootstrap/fieldtypes.js          |  2 --
 .../components/fieldtypes/RoutesFieldtype.vue | 26 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 resources/js/components/fieldtypes/RoutesFieldtype.vue

diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index 6bb612187cb..4e6b20121ad 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -13,7 +13,6 @@ Vue.component('slug-fieldtype', require('../components/fieldtypes/SlugFieldtype.
 // Fieldtypes
 import FieldsetFieldtype from '../components/fieldtypes/FieldsetFieldtype.vue'
 import RevealerFieldtype from '../components/fieldtypes/RevealerFieldtype.vue'
-import RoutesFieldtype from '../components/fieldtypes/RoutesFieldtype.vue'
 import StatusFieldtype from '../components/fieldtypes/StatusFieldtype.vue'
 import TemplateFieldtype from '../components/fieldtypes/TemplateFieldtype.vue'
 
@@ -44,7 +43,6 @@ Vue.component('relationship-fieldtype-index', require('../components/fieldtypes/
 Vue.component('replicator-fieldtype', require('../components/fieldtypes/replicator/Replicator.vue').default);
 Vue.component('replicator-fieldtype-index', require('../components/fieldtypes/replicator/ReplicatorIndex.vue').default);
 Vue.component('revealer-fieldtype', RevealerFieldtype);
-Vue.component('routes-fieldtype', RoutesFieldtype);
 Vue.component('section-fieldtype', require('../components/fieldtypes/SectionFieldtype.vue').default);
 Vue.component('select-fieldtype', require('../components/fieldtypes/SelectFieldtype.vue').default);
 Vue.component('sets-fieldtype', require('../components/fieldtypes/replicator/SetsFieldtype.vue').default);
diff --git a/resources/js/components/fieldtypes/RoutesFieldtype.vue b/resources/js/components/fieldtypes/RoutesFieldtype.vue
deleted file mode 100644
index 9fe98b682ab..00000000000
--- a/resources/js/components/fieldtypes/RoutesFieldtype.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-    <div class="routes-fieldtype-wrapper">
-        <grid-fieldtype :data="data" :config="gridConfig"></grid-fieldtype>
-        <input type="hidden" :name="name" :value="data | json" />
-    </div>
-</template>
-
-<script>
-export default {
-
-    props: ['data', 'config', 'name'],
-
-    data: function() {
-        return {
-            gridConfig: {
-                add_row: __('Add Locale'),
-                fields: [
-                    { name: 'locale', type: 'text', display: __('Locale'), width: '20' },
-                    { name: 'route', type: 'text', display: __('Route') },
-                ]
-            }
-        }
-    }
-
-};
-</script>

From 8bd21f7e7cc7815091ae9fff0fa5003184009e83 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Mar 2020 14:21:18 -0400
Subject: [PATCH 121/137] Set sites where necessary

---
 .../CP/Collections/CollectionsController.php          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index debb838e3fd..1510d1886f1 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -188,7 +188,6 @@ public function update(Request $request, $collection)
 
         $collection
             ->title($values['title'])
-            ->sites($values['sites'])
             ->routes($values['routes'])
             ->dated($values['dated'])
             ->template($values['template'])
@@ -200,6 +199,10 @@ public function update(Request $request, $collection)
             ->mount($values['mount'] ?? null)
             ->taxonomies($values['taxonomies'] ?? []);
 
+        if ($sites = array_get($values, 'sites')) {
+            $collection->sites($sites);
+        }
+
         if ($futureDateBehavior = array_get($values, 'future_date_behavior')) {
             $collection->futureDateBehavior($futureDateBehavior);
         }
@@ -211,7 +214,7 @@ public function update(Request $request, $collection)
         if (! $values['structured']) {
             $collection->structure(null);
         } else {
-            $collection->structure($this->makeStructure($collection, $values['max_depth'], $values['expects_root'], $values['sites']));
+            $collection->structure($this->makeStructure($collection, $values['max_depth'], $values['expects_root'], $values['sites'] ?? null));
         }
 
         $collection->save();
@@ -225,6 +228,10 @@ protected function makeStructure($collection, $maxDepth, $expectsRoot, $sites)
             $structure = (new CollectionStructure)->collection($collection);
         }
 
+        if (! $sites) {
+            $sites = [Site::default()->handle()];
+        }
+
         foreach (Site::all() as $site) {
             $site = $site->handle();
             $shouldExist = in_array($site, $sites);

From 870a084b867554856a04a2612d6f4b53acf9e3db Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Mar 2020 14:21:26 -0400
Subject: [PATCH 122/137] Prevent error when not using multisite

---
 resources/js/components/collections/Routes.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/js/components/collections/Routes.vue b/resources/js/components/collections/Routes.vue
index 817fa312d32..61da2949222 100644
--- a/resources/js/components/collections/Routes.vue
+++ b/resources/js/components/collections/Routes.vue
@@ -62,6 +62,8 @@ export default {
         sites() {
             let state = this.$store.state.publish[this.storeName];
 
+            if (!state.values.sites) return [];
+
             return state.values.sites.map((handle, i) => {
                 return {
                     handle,

From f0775efcbfa012a80c6ea21558e737fc15c63f55 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 14:32:38 -0400
Subject: [PATCH 123/137] Bring back update collection test basics

---
 .../Collections/UpdateCollectionTest.php      | 144 ++++++++++--------
 1 file changed, 78 insertions(+), 66 deletions(-)

diff --git a/tests/Feature/Collections/UpdateCollectionTest.php b/tests/Feature/Collections/UpdateCollectionTest.php
index 1bf5c2717fd..f02e59d27ef 100644
--- a/tests/Feature/Collections/UpdateCollectionTest.php
+++ b/tests/Feature/Collections/UpdateCollectionTest.php
@@ -2,25 +2,19 @@
 
 namespace Tests\Feature\Collections;
 
-use Tests\TestCase;
-use Tests\FakesRoles;
-use Statamic\Facades\User;
+use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
-use Illuminate\Support\Facades\Event;
-use Statamic\Events\Data\CollectionSaved;
+use Statamic\Facades\User;
+use Statamic\Fields\BlueprintRepository;
+use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
 
 class UpdateCollectionTest extends TestCase
 {
     use FakesRoles;
     use PreventSavingStacheItemsToDisk;
 
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->markTestIncomplete(); // TODO: implementation was changed, tests werent.
-    }
-
     /** @test */
     function it_denies_access_if_you_dont_have_permission()
     {
@@ -29,7 +23,7 @@ function it_denies_access_if_you_dont_have_permission()
         $this
             ->from('/original')
             ->actingAs($this->userWithoutPermission())
-            ->patch(cp_route('collections.update', $collection->handle()))
+            ->update($collection)
             ->assertRedirect('/original')
             ->assertSessionHas('error');
     }
@@ -37,88 +31,106 @@ function it_denies_access_if_you_dont_have_permission()
     /** @test */
     function it_updates_a_collection()
     {
-        $collection = $this->createCollection();
-        Event::fake(); // Fake after the initial collection is created.
+        config(['statamic.amp.enabled' => true]);
+
+        $collection = tap(
+            Collection::make('test')
+            ->title('Original title')
+            ->dated(false)
+            ->template('original-template')
+            ->layout('original-layout')
+            ->defaultPublishState(true)
+            ->sortDirection('asc')
+            ->ampable(false)
+        )->save();
         $this->assertCount(1, Collection::all());
+        $this->assertEquals('Original title', $collection->title());
+        $this->assertFalse($collection->dated());
+        $this->assertEquals('public', $collection->pastDateBehavior());
+        $this->assertEquals('public', $collection->futureDateBehavior());
+        $this->assertEquals('original-template', $collection->template());
+        $this->assertEquals('original-layout', $collection->layout());
+        $this->assertTrue($collection->defaultPublishState());
+        $this->assertEquals('asc', $collection->sortDirection());
+        $this->assertFalse($collection->ampable());
 
         $this
             ->actingAs($this->userWithPermission())
-            ->patch(cp_route('collections.update', $collection->handle()), $this->validParams())
-            ->assertJson(['redirect' => cp_route('collections.edit', $collection->handle())])
-            ->assertSessionHas('success');
+            ->update($collection, [
+                'title' => 'Updated title',
+                'dated' => true,
+                'past_date_behavior' => 'private',
+                'future_date_behavior' => 'hidden',
+                'template' => 'updated-template',
+                'layout' => 'updated-layout',
+                'default_publish_state' => false,
+                'sort_direction' => 'desc',
+                'amp' => true,
+            ])
+            ->assertOk();
 
         $this->assertCount(1, Collection::all());
-        $this->assertEquals([
-            'title' => 'Updated',
-            'template' => 'updated-template',
-            'fieldset' => 'updated-fieldset',
-            'route' => 'updated-route',
-            'order' => 'number'
-        ], $collection->data());
-
-        Event::assertDispatched(CollectionSaved::class, function ($event) use ($collection) {
-            return $event->collection === $collection;
-        });
+        $updated = Collection::all()->first();
+        $this->assertEquals('Updated title', $updated->title());
+        $this->assertTrue($updated->dated());
+        $this->assertEquals('private', $collection->pastDateBehavior());
+        $this->assertEquals('hidden', $collection->futureDateBehavior());
+        $this->assertEquals('updated-template', $updated->template());
+        $this->assertEquals('updated-layout', $updated->layout());
+        $this->assertFalse($updated->defaultPublishState());
+        $this->assertEquals('desc', $updated->sortDirection());
+        $this->assertTrue($updated->ampable());
+        // $this->assertEquals(['three', 'four'], $updated->entryBlueprints());
+        // structure
     }
 
     /** @test */
-    function title_is_required()
+    function it_updates_blueprints()
     {
-        $collection = $this->createCollection();
-        $this->assertCount(1, Collection::all());
+        $mock = $this->partialMock(BlueprintRepository::class);
+        $mock->shouldReceive('find')->with('one')->andReturn(Blueprint::make('one'));
+        $mock->shouldReceive('find')->with('two')->andReturn(Blueprint::make('two'));
+        $mock->shouldReceive('find')->with('three')->andReturn(Blueprint::make('three'));
+        $mock->shouldReceive('find')->with('four')->andReturn(Blueprint::make('four'));
+
+        $collection = tap(Collection::make('test')->entryBlueprints(['one', 'two']))->save();
+        $this->assertEquals(['one', 'two'], $collection->entryBlueprints()->map->handle()->all());
 
         $this
-            ->from('/original')
             ->actingAs($this->userWithPermission())
-            ->patch(cp_route('collections.update', $collection->handle()), $this->validParams([
-                'title' => ''
-            ]))
-            ->assertRedirect('/original')
-            ->assertSessionHasErrors('title');
-
-        $this->assertCollectionUnchanged($collection);
-    }
+            ->update($collection, ['blueprints' => ['three', 'four']])
+            ->assertOk();
 
-    private function createCollection()
-    {
-        return tap(Collection::make('test'))->data([
-            'title' => 'Existing',
-            'template' => 'existing-template',
-            'fieldset' => 'existing-fieldset',
-            'route' => 'existing-route',
-            'order' => 'number',
-        ])->save();
-    }
-
-    private function validParams($overrides = [])
-    {
-        return array_merge([
-            'title' => 'Updated',
-            'template' => 'updated-template',
-            'fieldset' => 'updated-fieldset',
-            'route' => 'updated-route',
-        ], $overrides);
+        $this->assertEquals(['three', 'four'], Collection::all()->first()->entryBlueprints()->map->handle()->all());
     }
 
     private function userWithoutPermission()
     {
         $this->setTestRoles(['test' => ['access cp']]);
 
-        return User::make()->assignRole('test');
+        return tap(User::make()->assignRole('test'))->save();
     }
 
     private function userWithPermission()
     {
         $this->setTestRoles(['test' => ['access cp', 'configure collections']]);
 
-        return User::make()->assignRole('test');
+        return tap(User::make()->assignRole('test'))->save();
     }
 
-    private function assertCollectionUnchanged($collection)
+    private function update($collection, $params = [])
     {
-        $this->assertEquals('Existing', $collection->get('title'));
-        $this->assertEquals('existing-template', $collection->get('template'));
-        $this->assertEquals('existing-fieldset', $collection->get('fieldset'));
-        $this->assertEquals('existing-route', $collection->get('route'));
+        $params = array_merge([
+            'title' => 'Updated title',
+            'dated' => false,
+            'past_date_behavior' => 'public',
+            'future_date_behavior' => 'public',
+            'template' => 'updated-template',
+            'layout' => 'updated-layout',
+            'default_publish_state' => true,
+            'ampable' => false,
+        ], $params);
+
+        return $this->patch(cp_route('collections.update', $collection->handle()), $params);
     }
 }

From 00f165cd555b4ce650a5520f57ff79ce0c34d70e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 15:21:57 -0400
Subject: [PATCH 124/137] Collection structure trees just come from the sites

---
 .../CP/Collections/CollectionsController.php  | 17 --------------
 src/Structures/CollectionStructure.php        |  7 ++++++
 .../Structures/CollectionStructureTest.php    | 22 +++++++++++++++++++
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 1510d1886f1..844f5d0e5d1 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -228,23 +228,6 @@ protected function makeStructure($collection, $maxDepth, $expectsRoot, $sites)
             $structure = (new CollectionStructure)->collection($collection);
         }
 
-        if (! $sites) {
-            $sites = [Site::default()->handle()];
-        }
-
-        foreach (Site::all() as $site) {
-            $site = $site->handle();
-            $shouldExist = in_array($site, $sites);
-
-            if ($shouldExist && !$structure->existsIn($site)) {
-                $structure->addTree($structure->makeTree($site));
-            }
-
-            if (!$shouldExist && $structure->existsIn($site)) {
-                $structure->removeTree($structure->in($site));
-            }
-        }
-
         return $structure
             ->maxDepth($maxDepth)
             ->expectsRoot($expectsRoot);
diff --git a/src/Structures/CollectionStructure.php b/src/Structures/CollectionStructure.php
index c35bc70760b..d8af243142e 100644
--- a/src/Structures/CollectionStructure.php
+++ b/src/Structures/CollectionStructure.php
@@ -99,6 +99,13 @@ public function save()
         return true;
     }
 
+    public function trees()
+    {
+        return $this->collection()->sites()->mapWithKeys(function ($site) {
+            return [$site => $this->in($site)];
+        });
+    }
+
     public function in($site)
     {
         if ($tree = parent::in($site)) {
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
index 85393201f8d..eb43318e995 100644
--- a/tests/Data/Structures/CollectionStructureTest.php
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -6,6 +6,7 @@
 use Statamic\Facades\Entry;
 use Statamic\Stache\Query\EntryQueryBuilder;
 use Statamic\Structures\CollectionStructure;
+use Statamic\Structures\Tree;
 
 class CollectionStructureTest extends StructureTestCase
 {
@@ -15,6 +16,7 @@ public function setUp(): void
 
         $this->entryQueryBuilder = $this->mock(EntryQueryBuilder::class);
         $this->entryQueryBuilder->shouldReceive('where')->with('site', 'en')->andReturnSelf();
+        $this->entryQueryBuilder->shouldReceive('where')->with('site', 'fr')->andReturnSelf();
         $this->entryQueryBuilder->shouldReceive('get')->andReturnUsing(function () {
             return $this->queryBuilderGetReturnValue();
         });
@@ -74,6 +76,26 @@ function the_title_cannot_be_set()
         $this->structure()->title('test');
     }
 
+    /** @test */
+    function trees_exist_based_on_whether_the_site_is_enabled_on_the_collection()
+    {
+        $this->collection->shouldReceive('handle')->andReturn('test');
+        $this->collection->shouldReceive('sites')->andReturn(collect(['en', 'fr']));
+
+        $structure = $this->structure();
+        $structure->addTree($structure->makeTree('en')->tree(['foo' => 'bar']));
+
+        $trees = $structure->trees();
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $trees);
+        $this->assertCount(2, $trees);
+        $this->assertEveryItemIsInstanceOf(Tree::class, $trees);
+        $this->assertTrue($structure->existsIn('en'));
+        $this->assertTrue($structure->existsIn('fr'));
+        $this->assertFalse($structure->existsIn('de'));
+        $this->assertEquals(['foo' => 'bar'], $structure->in('en')->tree()); // manually added tree is maintained
+        $this->assertEquals([], $structure->in('fr')->tree());
+    }
+
     /** @test */
     function it_sets_and_gets_the_associated_collection()
     {

From 512624588e0a3110db381093b68dffa4e8000234 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 15:23:34 -0400
Subject: [PATCH 125/137] Tidy. There will always be a value.

---
 .../CP/Collections/CollectionsController.php         | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 844f5d0e5d1..f963949d374 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -197,20 +197,14 @@ public function update(Request $request, $collection)
             ->ampable($values['amp'])
             ->entryBlueprints($values['blueprints'])
             ->mount($values['mount'] ?? null)
-            ->taxonomies($values['taxonomies'] ?? []);
+            ->taxonomies($values['taxonomies'] ?? [])
+            ->futureDateBehavior(array_get($values, 'future_date_behavior'))
+            ->pastDateBehavior(array_get($values, 'past_date_behavior'));
 
         if ($sites = array_get($values, 'sites')) {
             $collection->sites($sites);
         }
 
-        if ($futureDateBehavior = array_get($values, 'future_date_behavior')) {
-            $collection->futureDateBehavior($futureDateBehavior);
-        }
-
-        if ($pastDateBehavior = array_get($values, 'past_date_behavior')) {
-            $collection->pastDateBehavior($pastDateBehavior);
-        }
-
         if (! $values['structured']) {
             $collection->structure(null);
         } else {

From 8eebd48dce7c8ecbda7bd1cc7e56c8812e281d5f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 15:23:40 -0400
Subject: [PATCH 126/137] Conditionally show them

---
 .../Controllers/CP/Collections/CollectionsController.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index f963949d374..9254d3d8a68 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -264,6 +264,9 @@ protected function editFormBlueprint()
                             'unlisted' => 'Unlisted - Hidden from listings, URLs visible',
                             'private' => 'Private - Hidden from listings, URLs 404'
                         ],
+                        'if' => [
+                            'dated' => true
+                        ]
                     ],
                     'future_date_behavior' => [
                         'type' => 'select',
@@ -274,6 +277,9 @@ protected function editFormBlueprint()
                             'unlisted' => 'Unlisted - Hidden from listings, URLs visible',
                             'private' => 'Private - Hidden from listings, URLs 404'
                         ],
+                        'if' => [
+                            'dated' => true
+                        ]
                     ],
                 ],
             ],

From 5958f00a78f7284cba525b5f9fb4324d6597cf08 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 15:23:52 -0400
Subject: [PATCH 127/137] Remove outdated method

---
 src/Console/Commands/Multisite.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Console/Commands/Multisite.php b/src/Console/Commands/Multisite.php
index 39162fe041a..dd7b00728e0 100644
--- a/src/Console/Commands/Multisite.php
+++ b/src/Console/Commands/Multisite.php
@@ -121,7 +121,6 @@ protected function moveNav($nav)
         $tree = $yaml['tree'] ?? [];
 
         $nav
-            ->sites([$this->siteOne, $this->siteTwo])
             ->addTree($nav->makeTree($this->siteOne)->tree($tree))
             ->addTree($nav->makeTree($this->siteTwo)->tree($tree))
             ->save();

From 4ba76e124001646e09f9bbcb748c0e8e511cb73b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 16:27:13 -0400
Subject: [PATCH 128/137] Increase width to fit "first child" option

---
 resources/js/components/fieldtypes/RedirectFieldtype.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
index 48581e75c03..c013cebd8a6 100644
--- a/resources/js/components/fieldtypes/RedirectFieldtype.vue
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -3,7 +3,7 @@
         <div class="mr-2" v-if="!config.required">
             <toggle-fieldtype handle="enabled" v-model="enabled" />
         </div>
-        <div class="w-32 mr-2">
+        <div class="w-48 mr-2">
             <v-select
                 v-if="enabled"
                 v-model="option"

From 215f1fd75a935c230a029d0b4df070e0f221c6c8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 16:28:22 -0400
Subject: [PATCH 129/137] Populate the data using the value if an entry has
 been selected

---
 src/Fieldtypes/Redirect.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Fieldtypes/Redirect.php b/src/Fieldtypes/Redirect.php
index e095e5ee9e6..2cd1e5e6029 100644
--- a/src/Fieldtypes/Redirect.php
+++ b/src/Fieldtypes/Redirect.php
@@ -5,6 +5,7 @@
 use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Routing\ResolveRedirect;
+use Statamic\Support\Str;
 
 class Redirect extends Fieldtype
 {
@@ -15,11 +16,19 @@ public function augment($value)
 
     public function preload()
     {
-        $entryFieldtype = (new Field('entry', [
+        $value = $this->field->value();
+
+        $entryField = (new Field('entry', [
             'type' => 'entries',
             'max_items' => 1,
             'create' => false,
-        ]))->fieldtype();
+        ]));
+
+        if (Str::startsWith($value, 'entry::')) {
+            $entryField->setValue(Str::after($value, 'entry::'));
+        }
+
+        $entryFieldtype = $entryField->fieldtype();
 
         return [
             'entry' => [

From 7a2c88a14a10fd51046412a2a55b022d2a562924 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 16:33:16 -0400
Subject: [PATCH 130/137] Update the meta where necessary ...

This is technically updating the prop which is not great, but works fine. shh.
---
 resources/js/components/fieldtypes/RedirectFieldtype.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/fieldtypes/RedirectFieldtype.vue b/resources/js/components/fieldtypes/RedirectFieldtype.vue
index c013cebd8a6..3962358f2bb 100644
--- a/resources/js/components/fieldtypes/RedirectFieldtype.vue
+++ b/resources/js/components/fieldtypes/RedirectFieldtype.vue
@@ -26,6 +26,7 @@
                 :config="meta.entry.config"
                 :meta="meta.entry.meta"
                 @input="entriesSelected"
+                @meta-updated="meta.entry.meta = $event"
             />
 
         </div>

From 71990cd12c6e9563cb6df4dc45476843dd8440ae Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 17:41:52 -0400
Subject: [PATCH 131/137] Add chevron to imply there are options

---
 .../js/components/entries/CreateEntryButton.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/entries/CreateEntryButton.vue b/resources/js/components/entries/CreateEntryButton.vue
index a98cb9fcbd3..86a588f381a 100644
--- a/resources/js/components/entries/CreateEntryButton.vue
+++ b/resources/js/components/entries/CreateEntryButton.vue
@@ -1,11 +1,14 @@
 <template>
 
-    <dropdown-list class="inline-block" :show-dropdown-if="blueprints.length > 1">
+    <dropdown-list class="inline-block" :show-dropdown-if="hasMultipleBlueprints">
         <template v-slot:trigger>
             <button
-                :class="buttonClass"
+                :class="[buttonClass, {'flex items-center pr-2': hasMultipleBlueprints }]"
                 @click="create"
-                v-text="text" />
+            >
+                {{ text }}
+                <svg-icon name="chevron-down-xs" class="w-2 ml-2" v-if="hasMultipleBlueprints" />
+            </button>
         </template>
 
         <div v-for="blueprint in blueprints" :key="blueprint.handle">
@@ -25,6 +28,14 @@ export default {
         buttonClass: { type: String, default: 'btn' }
     },
 
+    computed: {
+
+        hasMultipleBlueprints() {
+            return this.blueprints.length > 1;
+        }
+
+    },
+
     methods: {
 
         create() {

From 067b47e07b70e54fb95fe0e768af2bb88a5c94a8 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Mon, 16 Mar 2020 17:42:12 -0400
Subject: [PATCH 132/137] :lipstick: Fix button specificicicicity

---
 resources/sass/elements/buttons.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/sass/elements/buttons.scss b/resources/sass/elements/buttons.scss
index 6d3f18868e4..01d0a59c703 100644
--- a/resources/sass/elements/buttons.scss
+++ b/resources/sass/elements/buttons.scss
@@ -129,7 +129,7 @@
     @apply flex items-center p-0;
     height: 2.375rem;
 
-    button:first-child {
+    > button:first-child {
         @apply border-r rounded-r-none;
     }
 

From 785c07c8b5fe1ec978ca0cb89fde5dacd7b5b4d8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 16 Mar 2020 17:44:16 -0400
Subject: [PATCH 133/137] Add chevron to imply there are options

---
 resources/js/components/navigation/View.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 958ebb09aa6..a9844b59d20 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -23,7 +23,10 @@
 
                 <dropdown-list :show-dropdown-if="collections.length > 0">
                     <template #trigger>
-                        <button class="btn" v-text="__('Add Link')" @click="addLink" />
+                        <button class="btn flex items-center pr-2" @click="addLink">
+                            {{ __('Add Link') }}
+                            <svg-icon name="chevron-down-xs" class="w-2 ml-2" />
+                        </button>
                     </template>
                     <dropdown-item :text="__('Link to URL')" @click="linkPage" />
                     <dropdown-item :text="__('Link to Entry')" @click="linkEntries" />

From a6eb93a12864f33a9282403d3d144dceffc0e42a Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Mon, 16 Mar 2020 19:59:22 -0400
Subject: [PATCH 134/137] :lipstick: Replace flat togglers with clicky togglers

---
 resources/js/components/collections/View.vue | 4 ++--
 resources/sass/elements/buttons.scss         | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 16147db552e..41b4ff28b57 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -14,10 +14,10 @@
                 </dropdown-list>
 
                 <div class="btn-group mr-2" v-if="canUseStructureTree && !treeIsDirty">
-                    <button class="btn-flat px-2" @click="view = 'tree'" :class="{'active': view === 'tree'}">
+                    <button class="btn px-2" @click="view = 'tree'" :disabled="view === 'tree'">
                         <svg-icon name="structures" class="h-4 w-4"/>
                     </button>
-                    <button class="btn-flat px-2" @click="view = 'list'" :class="{'active': view === 'list'}">
+                    <button class="btn px-2" @click="view = 'list'" :disabled="view === 'list'">
                         <svg-icon name="assets-mode-table" class="h-4 w-4" />
                     </button>
                 </div>
diff --git a/resources/sass/elements/buttons.scss b/resources/sass/elements/buttons.scss
index 01d0a59c703..ea1ecf12657 100644
--- a/resources/sass/elements/buttons.scss
+++ b/resources/sass/elements/buttons.scss
@@ -17,8 +17,7 @@
     }
 
     &:disabled {
-        @apply opacity-50;
-        cursor: not-allowed;
+        @apply cursor-default;
     }
 }
 
@@ -34,6 +33,11 @@
         background: linear-gradient(180deg, #f9fafb, #f4f6f8);
         border-color: #c4cdd5;
     }
+
+    &:disabled {
+        @apply text-grey-70;
+        background: config('colors.grey-30') !important;
+    }
 }
 
 // Primary action button

From b10a6a0e5f96ec466ace213b09ed2639a984b441 Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Mon, 16 Mar 2020 20:04:14 -0400
Subject: [PATCH 135/137] :lipstick: Wangjangle some margins

---
 resources/js/components/collections/View.vue          | 2 +-
 resources/js/components/entries/CreateEntryButton.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 41b4ff28b57..0293f8e01f0 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -39,7 +39,7 @@
                     />
 
                     <button
-                        class="btn mx-2"
+                        class="btn mr-2"
                         :class="{ 'disabled': !treeIsDirty, 'btn-danger': deletedEntries.length }"
                         :disabled="!treeIsDirty"
                         @click="saveTree"
diff --git a/resources/js/components/entries/CreateEntryButton.vue b/resources/js/components/entries/CreateEntryButton.vue
index 86a588f381a..909a48e7ebc 100644
--- a/resources/js/components/entries/CreateEntryButton.vue
+++ b/resources/js/components/entries/CreateEntryButton.vue
@@ -7,7 +7,7 @@
                 @click="create"
             >
                 {{ text }}
-                <svg-icon name="chevron-down-xs" class="w-2 ml-2" v-if="hasMultipleBlueprints" />
+                <svg-icon name="chevron-down-xs" class="w-2 ml-1" v-if="hasMultipleBlueprints" />
             </button>
         </template>
 

From 5576daa934bc2e147131437e6bff858be3266f6d Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Mon, 16 Mar 2020 21:15:48 -0400
Subject: [PATCH 136/137] :lipstick: Add title header to the blueprint picker

---
 resources/js/components/entries/CreateEntryButton.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/entries/CreateEntryButton.vue b/resources/js/components/entries/CreateEntryButton.vue
index 909a48e7ebc..19e44b086f7 100644
--- a/resources/js/components/entries/CreateEntryButton.vue
+++ b/resources/js/components/entries/CreateEntryButton.vue
@@ -10,6 +10,7 @@
                 <svg-icon name="chevron-down-xs" class="w-2 ml-1" v-if="hasMultipleBlueprints" />
             </button>
         </template>
+        <h6 v-text="__('Choose Blueprint')" class="p-1" />
 
         <div v-for="blueprint in blueprints" :key="blueprint.handle">
             <dropdown-item :text="blueprint.title" @click="select(blueprint.handle)" />

From 84a16f94bfc976b619e521bee6f9c53352ac2081 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 17 Mar 2020 10:05:07 -0400
Subject: [PATCH 137/137] Support cmd+clicking to open new entry in a new
 window

---
 resources/js/components/DropdownItem.vue              | 4 ++--
 resources/js/components/entries/CreateEntryButton.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/DropdownItem.vue b/resources/js/components/DropdownItem.vue
index fd04337e25a..bffa4c44773 100644
--- a/resources/js/components/DropdownItem.vue
+++ b/resources/js/components/DropdownItem.vue
@@ -12,7 +12,7 @@ export default {
     props: ['text', 'redirect', 'externalLink'],
 
     methods: {
-        selectAndClose() {
+        selectAndClose($event) {
             if (this.redirect) {
                 location.href = this.redirect;
                 return;
@@ -23,7 +23,7 @@ export default {
                 return;
             }
 
-            this.$emit('click');
+            this.$emit('click', $event);
 
             this.$parent.close();
         }
diff --git a/resources/js/components/entries/CreateEntryButton.vue b/resources/js/components/entries/CreateEntryButton.vue
index 19e44b086f7..227e3e91bde 100644
--- a/resources/js/components/entries/CreateEntryButton.vue
+++ b/resources/js/components/entries/CreateEntryButton.vue
@@ -13,7 +13,7 @@
         <h6 v-text="__('Choose Blueprint')" class="p-1" />
 
         <div v-for="blueprint in blueprints" :key="blueprint.handle">
-            <dropdown-item :text="blueprint.title" @click="select(blueprint.handle)" />
+            <dropdown-item :text="blueprint.title" @click="select(blueprint.handle, $event)" />
         </div>
     </dropdown-list>
 
@@ -43,14 +43,14 @@ export default {
             if (this.blueprints.length === 1) this.select();
         },
 
-        select(blueprint) {
+        select(blueprint, $event) {
             let url = this.url;
 
             if (blueprint) {
                 url = url += `?blueprint=${blueprint}`;
             }
 
-            window.location = url;
+            $event.metaKey ? window.open(url) : window.location = url;
         }
 
     }