templates: fix live preview relative URLs on website template (#9906)

payloadcms · Dec 11, 2024 · afa08d0 · afa08d0
1 parent d97d7ed
commit afa08d0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 20 deletions.
diff --git a/templates/website/src/collections/Pages/index.ts b/templates/website/src/collections/Pages/index.ts
@@ -39,10 +39,11 @@ export const Pages: CollectionConfig<'pages'> = {
   admin: {
     defaultColumns: ['title', 'slug', 'updatedAt'],
     livePreview: {
-      url: ({ data }) => {
+      url: ({ data, req }) => {
         const path = generatePreviewPath({
           slug: typeof data?.slug === 'string' ? data.slug : '',
           collection: 'pages',
+          req,
         })
 
         return path

diff --git a/templates/website/src/collections/Posts/index.ts b/templates/website/src/collections/Posts/index.ts
@@ -50,11 +50,11 @@ export const Posts: CollectionConfig<'posts'> = {
   admin: {
     defaultColumns: ['title', 'slug', 'updatedAt'],
     livePreview: {
-      url: ({ data }) => {
+      url: ({ data, req }) => {
         const path = generatePreviewPath({
           slug: typeof data?.slug === 'string' ? data.slug : '',
           collection: 'posts',
-          // req, TODO: thread `req` once 3.5.1 is out, see notes in `generatePreviewPath`
+          req,
         })
 
         return path

diff --git a/templates/website/src/utilities/generatePreviewPath.ts b/templates/website/src/utilities/generatePreviewPath.ts
@@ -8,7 +8,7 @@ const collectionPrefixMap: Partial<Record<CollectionSlug, string>> = {
 type Props = {
   collection: keyof typeof collectionPrefixMap
   slug: string
-  req?: PayloadRequest // TODO: make this required once 3.5.1 is out, it's a new argument in that version
+  req: PayloadRequest
 }
 
 export const generatePreviewPath = ({ collection, slug, req }: Props) => {
@@ -26,12 +26,7 @@ export const generatePreviewPath = ({ collection, slug, req }: Props) => {
     encodedParams.append(key, value)
   })
 
-  let url = `/next/preview?${encodedParams.toString()}`
-
-  // TODO: remove this check once 3.5.1 is out, see note above
-  if (req) {
-    url = `${req.protocol}//${req.host}${url}`
-  }
+  let url = `${req.protocol}//${req.host}/next/preview?${encodedParams.toString()}`
 
   return url
 }
diff --git a/templates/with-vercel-website/src/collections/Pages/index.ts b/templates/with-vercel-website/src/collections/Pages/index.ts
@@ -39,10 +39,11 @@ export const Pages: CollectionConfig<'pages'> = {
   admin: {
     defaultColumns: ['title', 'slug', 'updatedAt'],
     livePreview: {
-      url: ({ data }) => {
+      url: ({ data, req }) => {
         const path = generatePreviewPath({
           slug: typeof data?.slug === 'string' ? data.slug : '',
           collection: 'pages',
+          req,
         })
 
         return path

diff --git a/templates/with-vercel-website/src/collections/Posts/index.ts b/templates/with-vercel-website/src/collections/Posts/index.ts
@@ -50,11 +50,11 @@ export const Posts: CollectionConfig<'posts'> = {
   admin: {
     defaultColumns: ['title', 'slug', 'updatedAt'],
     livePreview: {
-      url: ({ data }) => {
+      url: ({ data, req }) => {
         const path = generatePreviewPath({
           slug: typeof data?.slug === 'string' ? data.slug : '',
           collection: 'posts',
-          // req, TODO: thread `req` once 3.5.1 is out, see notes in `generatePreviewPath`
+          req,
         })
 
         return path

diff --git a/templates/with-vercel-website/src/utilities/generatePreviewPath.ts b/templates/with-vercel-website/src/utilities/generatePreviewPath.ts
@@ -8,7 +8,7 @@ const collectionPrefixMap: Partial<Record<CollectionSlug, string>> = {
 type Props = {
   collection: keyof typeof collectionPrefixMap
   slug: string
-  req?: PayloadRequest // TODO: make this required once 3.5.1 is out, it's a new argument in that version
+  req: PayloadRequest
 }
 
 export const generatePreviewPath = ({ collection, slug, req }: Props) => {
@@ -26,12 +26,7 @@ export const generatePreviewPath = ({ collection, slug, req }: Props) => {
     encodedParams.append(key, value)
   })
 
-  let url = `/next/preview?${encodedParams.toString()}`
-
-  // TODO: remove this check once 3.5.1 is out, see note above
-  if (req) {
-    url = `${req.protocol}//${req.host}${url}`
-  }
+  let url = `${req.protocol}//${req.host}/next/preview?${encodedParams.toString()}`
 
   return url
 }