From abd983f421edcd5cc1e6728a10faa4492f68cadc Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <30633324+JarrodMFlesch@users.noreply.github.com>
Date: Thu, 7 Sep 2023 11:06:57 -0400
Subject: [PATCH] chore: mirror changes from PR #3276 (#3284)

---
 .../buildStateFromSchema/addFieldStatePromise.ts   | 14 ++++++++++++++
 .../src/admin/components/views/Global/index.tsx    |  2 +-
 .../components/views/collections/Edit/index.tsx    |  2 +-
 test/hooks/collections/ContextHooks/index.ts       |  6 ++----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/payload/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts b/packages/payload/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts
index a487ed904f..7baa893e02 100644
--- a/packages/payload/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts
+++ b/packages/payload/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts
@@ -265,6 +265,20 @@ export const addFieldStatePromise = async ({
         break
       }
 
+      case 'relationship':
+      case 'upload': {
+        const relationshipValue =
+          valueWithDefault && typeof valueWithDefault === 'object' && 'id' in valueWithDefault
+            ? valueWithDefault.id
+            : valueWithDefault
+        fieldState.value = relationshipValue
+        fieldState.initialValue = relationshipValue
+
+        state[`${path}${field.name}`] = fieldState
+
+        break
+      }
+
       default: {
         fieldState.value = valueWithDefault
         fieldState.initialValue = valueWithDefault
diff --git a/packages/payload/src/admin/components/views/Global/index.tsx b/packages/payload/src/admin/components/views/Global/index.tsx
index 4a0c2b89c3..00b490e412 100644
--- a/packages/payload/src/admin/components/views/Global/index.tsx
+++ b/packages/payload/src/admin/components/views/Global/index.tsx
@@ -105,7 +105,7 @@ const GlobalView: React.FC<IndexProps> = (props) => {
       CustomComponent={CustomEdit}
       DefaultComponent={DefaultGlobal}
       componentProps={{
-        action: `${serverURL}${api}/globals/${slug}?locale=${locale}&depth=0&fallback-locale=null`,
+        action: `${serverURL}${api}/globals/${slug}?locale=${locale}&fallback-locale=null`,
         apiURL: `${serverURL}${api}/globals/${slug}?locale=${locale}${
           global.versions?.drafts ? '&draft=true' : ''
         }`,
diff --git a/packages/payload/src/admin/components/views/collections/Edit/index.tsx b/packages/payload/src/admin/components/views/collections/Edit/index.tsx
index 75d4f847b0..4ed1cabfa8 100644
--- a/packages/payload/src/admin/components/views/collections/Edit/index.tsx
+++ b/packages/payload/src/admin/components/views/collections/Edit/index.tsx
@@ -112,7 +112,7 @@ const EditView: React.FC<IndexProps> = (props) => {
   }`
   const action = `${serverURL}${api}/${slug}${
     isEditing ? `/${id}` : ''
-  }?locale=${locale}&depth=0&fallback-locale=null`
+  }?locale=${locale}&fallback-locale=null`
   const hasSavePermission =
     (isEditing && docPermissions?.update?.permission) ||
     (!isEditing && (docPermissions as CollectionPermission)?.create?.permission)
diff --git a/test/hooks/collections/ContextHooks/index.ts b/test/hooks/collections/ContextHooks/index.ts
index 0906ec72fd..fa581419de 100644
--- a/test/hooks/collections/ContextHooks/index.ts
+++ b/test/hooks/collections/ContextHooks/index.ts
@@ -2,8 +2,6 @@
 import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 import type { PayloadRequest } from '../../../../packages/payload/src/types'
 
-import payload from '../../../../packages/payload/src'
-
 export const contextHooksSlug = 'context-hooks'
 const ContextHooks: CollectionConfig = {
   slug: contextHooksSlug,
@@ -47,12 +45,12 @@ const ContextHooks: CollectionConfig = {
       },
     ],
     afterChange: [
-      async ({ context, doc }) => {
+      async ({ context, doc, req }) => {
         if (context.triggerAfterChange === false) {
           // Make sure we don't trigger afterChange again and again in an infinite loop
           return
         }
-        await payload.update({
+        await req.payload.update({
           collection: contextHooksSlug,
           id: doc.id,
           data: {