Allow duplicate entry slugs

resources/js/components/structures/PageTree.vue

@@ -191,7 +191,15 @@ export default {
                 this.initialPages = this.pages;
                 return response;
             }).catch(e => {
-                this.$toast.error(e.response ? e.response.data.message : __('Something went wrong'));
+                let message = e.response ? e.response.data.message : __('Something went wrong');
+
+                // For a validation error, show the first message from any field in the toast.
+                if (e.response && e.response.status === 422) {
+                    const { errors } = e.response.data;
+                    message = errors[Object.keys(errors)[0]][0];
+                }
+
+                this.$toast.error(message);
                 return Promise.reject(e);
             }).finally(() => this.saving = false);
         },

resources/lang/en/validation.php

@@ -128,6 +128,8 @@
     'duplicate_field_handle' => 'Field with a handle of :handle cannot be used more than once.',
     'one_site_without_origin' => 'At least one site must not have an origin.',
     'origin_cannot_be_disabled' => 'Cannot select a disabled origin.',
+    'unique_uri' => 'This URI has already been taken.',
+    'duplicate_uri' => 'Duplicate URI :value',
 
     /*
     |--------------------------------------------------------------------------

src/Contracts/Entries/EntryRepository.php

@@ -14,6 +14,7 @@ public function find($id);
 
     public function findByUri(string $uri);
 
+    /** @deprecated */
     public function findBySlug(string $slug, string $collection);
 
     public function make();

src/Contracts/Taxonomies/TermRepository.php

@@ -14,6 +14,7 @@ public function find($id);
 
     public function findByUri(string $uri);
 
+    /** @deprecated */
     public function findBySlug(string $slug, string $collection);
 
     public function make(string $slug = null);

src/Data/ExistsAsFile.php

@@ -13,6 +13,11 @@ trait ExistsAsFile
 
     abstract public function path();
 
+    public function buildPath()
+    {
+        return $this->path();
+    }
+
     public function initialPath($path = null)
     {
         if (func_num_args() === 0) {
@@ -77,9 +82,9 @@ public function fileExtension()
         return 'yaml';
     }
 
-    public function writeFile()
+    public function writeFile($path = null)
     {
-        $path = $this->path();
+        $path = $path ?? $this->buildPath();
         $initial = $this->initialPath();
 
         if ($initial && $path !== $initial) {

src/Entries/Entry.php

@@ -335,6 +335,11 @@ public function taxonomize()
     }
 
     public function path()
+    {
+        return $this->initialPath ?? $this->buildPath();
+    }
+
+    public function buildPath()
     {
         $prefix = '';
 

src/Entries/GetDateFromPath.php

@@ -8,8 +8,17 @@ public function __invoke($path)
     {
         $filename = pathinfo($path, PATHINFO_FILENAME);
 
-        return strpos($filename, '.') === false
-            ? null
-            : explode('.', pathinfo($path, PATHINFO_FILENAME))[0];
+        if (strpos($filename, '.') === false) {
+            return null;
+        }
+
+        $firstSegment = explode('.', pathinfo($path, PATHINFO_FILENAME), 2)[0];
+
+        return $this->isDate($firstSegment) ? $firstSegment : null;
+    }
+
+    private function isDate($str)
+    {
+        return preg_match('/^\d{4}-\d{2}-\d{2}(-\d{4})?$/', $str);
     }
 }

src/Entries/GetSlugFromPath.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Statamic\Entries;
+
+class GetSlugFromPath
+{
+    public function __invoke($path)
+    {
+        $path = pathinfo($path, PATHINFO_FILENAME);
+
+        if (strpos($path, '.') === false) {
+            return $path;
+        }
+
+        $segments = explode('.', $path);
+
+        if ($this->isDate($segments[0])) {
+            return $segments[1];
+        }
+
+        return $segments[0];
+    }
+
+    private function isDate($str)
+    {
+        return preg_match('/^\d{4}-\d{2}-\d{2}(-\d{4})?$/', $str);
+    }
+}

src/Facades/Endpoint/Path.php

@@ -89,36 +89,6 @@ public function resolve($path)
         return $leadingSlash ? Str::ensureLeft($path, '/') : $path;
     }
 
-    /**
-     * Cleans up a given $path, removing any flags and order keys (date-based or number-based).
-     *
-     * Assumes the path will always end with an extension.
-     *
-     * @param string  $path  Path to clean
-     * @return string
-     */
-    public function clean($path)
-    {
-        // Remove draft and hidden flags
-        $path = preg_replace('/\/_[_]?/', '/', $path);
-
-        // Strip the order keys
-        $segments = explode('/', $path);
-        $total_segments = count($segments);
-        foreach ($segments as $i => &$segment) {
-            // Skip the final segment (the basename) if it doesn't contain two periods.
-            // This stops filenames like 404.md from being interpreted with 404 as
-            // the order key, resulting in a borked filename.
-            if ($i + 1 === $total_segments && substr_count($segment, '.') < 2) {
-                continue;
-            }
-
-            $segment = preg_replace(Pattern::orderKey(), '', $segment);
-        }
-
-        return implode('/', $segments);
-    }
-
     /**
      * Assembles a URL from an ordered list of segments.
      *

src/Facades/Endpoint/URL.php

@@ -245,27 +245,6 @@ public function getSiteUrl()
         return Str::ensureRight($rootUrl, '/');
     }
 
-    /**
-     * Build a page URL from a path.
-     *
-     * @param string $path
-     * @return string
-     */
-    public function buildFromPath($path)
-    {
-        $path = Path::makeRelative($path);
-
-        $ext = pathinfo($path)['extension'];
-
-        $path = Path::clean($path);
-
-        $path = preg_replace('/^pages/', '', $path);
-
-        $path = preg_replace('#\/(?:[a-z]+\.)?index\.'.$ext.'$#', '', $path);
-
-        return Str::ensureLeft($path, '/');
-    }
-
     /**
      * Encode a URL.
      *

src/Facades/Entry.php

@@ -11,7 +11,6 @@
  * @method static \Statamic\Entries\EntryCollection whereInCollection(array $handles)
  * @method static null|\Statamic\Contracts\Entries\Entry find($id)
  * @method static null|\Statamic\Contracts\Entries\Entry findByUri(string $uri)
- * @method static null|\Statamic\Contracts\Entries\Entry findBySlug(string $slug, string $collection)
  * @method static \Statamic\Contracts\Entries\Entry make()
  * @method static \Statamic\Contracts\Entries\QueryBuilder query()
  * @method static void save($entry)

src/Facades/Term.php

@@ -14,7 +14,6 @@
  * @method static TermCollection whereInTaxonomy(array $handles)
  * @method static TermContract find($id)
  * @method static TermContract findByUri(string $uri, string $site = null)
- * @method static TermContract findBySlug(string $slug, string $taxonomy)
  * @method static save($term)
  * @method static delete($term)
  * @method static TermQueryBuilder query()

src/Facades/URL.php

@@ -20,7 +20,6 @@
  * @method static string format($url)
  * @method static bool isExternal($url)
  * @method static string getSiteUrl()
- * @method static string buildFromPath($path)
  * @method static string encode($url)
  * @method static mixed getDefaultUri($locale, $uri)
  * @method static string gravatar($email, $size = null)

src/Http/Controllers/CP/Collections/CollectionStructureController.php

@@ -3,6 +3,7 @@
 namespace Statamic\Http\Controllers\CP\Collections;
 
 use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 use Statamic\Facades\Entry;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
@@ -14,31 +15,22 @@ public function update(Request $request, $collection)
     {
         $this->authorize('reorder', $collection);
 
-        $deletedEntries = collect($request->deletedEntries ?? [])
-            ->map(function ($id) {
-                return Entry::find($id);
-            })
-            ->filter(function ($entry) {
-                return User::current()->can('delete', $entry);
-            });
+        $contents = $this->toTree($request->pages);
 
-        if ($request->deleteLocalizationBehavior === 'copy') {
-            $deletedEntries->each->detachLocalizations();
-        } else {
-            $deletedEntries->each->deleteDescendants();
-        }
+        $structure = $collection->structure();
+        $tree = $structure->in($request->site);
 
-        $deletedEntries->each->delete();
+        // Clone the tree and add the submitted contents into it so we can
+        // validate URI uniqueness without affecting the real object in memory.
+        $this->validateUniqueUris((clone $tree)->disableUriCache()->tree($contents));
 
-        $tree = $this->toTree($request->pages);
+        // Validate the tree, which will add any missing entries or throw an exception
+        // if somehow the root would end up having child pages, which isn't allowed.
+        $contents = $structure->validateTree($contents, $request->site);
 
-        $tree = $collection->structure()->validateTree($tree, $request->site);
+        $this->deleteEntries($request);
 
-        $collection
-            ->structure()
-            ->in($request->site)
-            ->tree($tree)
-            ->save();
+        $tree->tree($contents)->save();
     }
 
     protected function toTree($items)
@@ -52,4 +44,49 @@ protected function toTree($items)
             ]);
         })->all();
     }
+
+    private function validateUniqueUris($tree)
+    {
+        if (! $tree->collection()->route($tree->locale())) {
+            return;
+        }
+
+        foreach ($tree->diff()->moved() as $id) {
+            $page = $tree->page($id);
+            $parent = $page->parent();
+
+            $siblings = (! $parent || $parent->isRoot())
+                ? $tree->pages()->all()->slice(1)
+                : $page->parent()->pages()->all();
+
+            $siblings = $siblings->reject(function ($sibling) use ($id) {
+                return $sibling->reference() === $id;
+            });
+
+            $uris = $siblings->map->uri();
+
+            if ($uris->contains($uri = $page->uri())) {
+                throw ValidationException::withMessages(['uri' => trans('statamic::validation.duplicate_uri', ['value' => $uri])]);
+            }
+        }
+    }
+
+    private function deleteEntries($request)
+    {
+        $deletedEntries = collect($request->deletedEntries ?? [])
+            ->map(function ($id) {
+                return Entry::find($id);
+            })
+            ->filter(function ($entry) {
+                return User::current()->can('delete', $entry);
+            });
+
+        if ($request->deleteLocalizationBehavior === 'copy') {
+            $deletedEntries->each->detachLocalizations();
+        } else {
+            $deletedEntries->each->deleteDescendants();
+        }
+
+        $deletedEntries->each->delete();
+    }
 }

src/Http/Controllers/CP/Collections/EntriesController.php

@@ -3,6 +3,7 @@
 namespace Statamic\Http\Controllers\CP\Collections;
 
 use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\CP\Breadcrumbs;
 use Statamic\Facades\Asset;
@@ -196,9 +197,9 @@ public function update(Request $request, $collection, $entry)
         }
 
         if ($collection->structure() && ! $collection->orderable()) {
-            $entry->afterSave(function ($entry) use ($parent) {
-                $tree = $entry->structure()->in($entry->locale());
+            $tree = $entry->structure()->in($entry->locale());
 
+            $entry->afterSave(function ($entry) use ($parent, $tree) {
                 if ($parent && optional($tree->page($parent))->isRoot()) {
                     $parent = null;
                 }
@@ -209,6 +210,8 @@ public function update(Request $request, $collection, $entry)
             });
         }
 
+        $this->validateUniqueUri($entry, $tree ?? null, $parent ?? null);
+
         if ($entry->revisionsEnabled() && $entry->published()) {
             $entry
                 ->makeWorkingCopy()
@@ -340,6 +343,8 @@ public function store(Request $request, $collection, $site)
             });
         }
 
+        $this->validateUniqueUri($entry, $tree ?? null, $parent ?? null);
+
         if ($entry->revisionsEnabled()) {
             $entry->store([
                 'message' => $request->message,
@@ -432,6 +437,40 @@ protected function formatDateForSaving($date)
         return $date;
     }
 
+    private function validateUniqueUri($entry, $tree, $parent)
+    {
+        if (! $uri = $this->entryUri($entry, $tree, $parent)) {
+            return;
+        }
+
+        $existing = Entry::findByUri($uri);
+
+        if (! $existing || $existing->id() === $entry->id()) {
+            return;
+        }
+
+        throw ValidationException::withMessages(['slug' => __('statamic::validation.unique_uri')]);
+    }
+
+    private function entryUri($entry, $tree, $parent)
+    {
+        if (! $tree) {
+            return $entry->uri();
+        }
+
+        $parent = $parent ? $tree->page($parent) : null;
+
+        return app(\Statamic\Contracts\Routing\UrlBuilder::class)
+            ->content($entry)
+            ->merge([
+                'parent_uri' => $parent ? $parent->uri() : null,
+                'slug' => $entry->slug(),
+                // 'depth' => '', // todo
+                'is_root' => false,
+            ])
+            ->build($entry->route());
+    }
+
     protected function breadcrumbs($collection)
     {
         return new Breadcrumbs([