Merge pull request #131 from tinloof/tin-2756

definePathname uniqueness
tinloof · Feb 5, 2025 · 0ebb14c · 0ebb14c
2 parents c477989 + 09bd0cd
commit 0ebb14c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.changeset/six-queens-poke.md b/.changeset/six-queens-poke.md
@@ -0,0 +1,5 @@
+---
+"@tinloof/sanity-studio": patch
+---
+
+definePathname uniqueness check updated
diff --git a/packages/sanity-studio/src/utils/definePathname.ts b/packages/sanity-studio/src/utils/definePathname.ts
@@ -45,9 +45,12 @@ async function isUnique(
     draft: `drafts.${id}`,
     published: id,
     slug,
+    // Remove slash from end of slug if it exists
+    // Handle cases where there is a page with /blog but a new page is created with /blog/
+    slugWithoutSlash: slug.replace(/\/$/, ""),
     locale: document?.locale ?? null,
   };
-  const query = `*[!(_id in [$draft, $published]) && pathname.current == $slug && locale == $locale]`;
+  const query = `*[!(_id in [$draft, $published]) && (pathname.current == $slug || pathname.current == $slugWithoutSlash) && locale == $locale]`;
   const result = await client.fetch(query, params);
   return result.length === 0;
 }