chore: cleans up a few merges

packages/ui/src/elements/EditMany/index.tsx

@@ -11,7 +11,6 @@ import FormSubmit from '../../forms/Submit'
 import { X } from '../../icons/X'
 import { useAuth } from '../../providers/Auth'
 import { useConfig } from '../../providers/Config'
-import { DocumentInfoProvider } from '../../providers/DocumentInfo'
 import { OperationContext } from '../../providers/OperationProvider'
 import { useSearchParams } from '../../providers/SearchParams'
 import { SelectAllStatus, useSelection } from '../../providers/SelectionProvider'
@@ -126,56 +125,54 @@ const EditMany: React.FC<Props> = (props) => {
         {t('general:edit')}
       </DrawerToggler>
       <Drawer Header={null} slug={drawerSlug}>
-        <DocumentInfoProvider collection={collection}>
-          <OperationContext.Provider value="update">
-            <Form className={`${baseClass}__form`} onSuccess={onSuccess}>
-              <div className={`${baseClass}__main`}>
-                <div className={`${baseClass}__header`}>
-                  <h2 className={`${baseClass}__header__title`}>
-                    {t('general:editingLabel', { count, label: getTranslation(plural, i18n) })}
-                  </h2>
-                  <button
-                    aria-label={t('general:close')}
-                    className={`${baseClass}__header__close`}
-                    id={`close-drawer__${drawerSlug}`}
-                    onClick={() => closeModal(drawerSlug)}
-                    type="button"
-                  >
-                    <X />
-                  </button>
-                </div>
-                <FieldSelect fields={fields} setSelected={setSelected} />
-                [RenderFields]
+        <OperationContext.Provider value="update">
+          <Form className={`${baseClass}__form`} onSuccess={onSuccess}>
+            <div className={`${baseClass}__main`}>
+              <div className={`${baseClass}__header`}>
+                <h2 className={`${baseClass}__header__title`}>
+                  {t('general:editingLabel', { count, label: getTranslation(plural, i18n) })}
+                </h2>
+                <button
+                  aria-label={t('general:close')}
+                  className={`${baseClass}__header__close`}
+                  id={`close-drawer__${drawerSlug}`}
+                  onClick={() => closeModal(drawerSlug)}
+                  type="button"
+                >
+                  <X />
+                </button>
+              </div>
+              <FieldSelect fields={fields} setSelected={setSelected} />
+              [RenderFields]
               {/* <RenderFields fieldSchema={selected} fieldTypes={fieldTypes} /> */}
-                <div className={`${baseClass}__sidebar-wrap`}>
-                  <div className={`${baseClass}__sidebar`}>
-                    <div className={`${baseClass}__sidebar-sticky-wrap`}>
-                      <div className={`${baseClass}__document-actions`}>
-                        {collection.versions ? (
-                          <React.Fragment>
-                            <Publish
-                              action={`${serverURL}${api}/${slug}${getQueryParams()}`}
-                              disabled={selected.length === 0}
-                            />
-                            <SaveDraft
-                              action={`${serverURL}${api}/${slug}${getQueryParams()}`}
-                              disabled={selected.length === 0}
-                            />
-                          </React.Fragment>
-                        ) : (
-                          <Submit
+              <div className={`${baseClass}__sidebar-wrap`}>
+                <div className={`${baseClass}__sidebar`}>
+                  <div className={`${baseClass}__sidebar-sticky-wrap`}>
+                    <div className={`${baseClass}__document-actions`}>
+                      {collection.versions ? (
+                        <React.Fragment>
+                          <Publish
                             action={`${serverURL}${api}/${slug}${getQueryParams()}`}
                             disabled={selected.length === 0}
                           />
-                        )}
-                      </div>
+                          <SaveDraft
+                            action={`${serverURL}${api}/${slug}${getQueryParams()}`}
+                            disabled={selected.length === 0}
+                          />
+                        </React.Fragment>
+                      ) : (
+                        <Submit
+                          action={`${serverURL}${api}/${slug}${getQueryParams()}`}
+                          disabled={selected.length === 0}
+                        />
+                      )}
                     </div>
                   </div>
                 </div>
               </div>
-            </Form>
-          </OperationContext.Provider>
-        </DocumentInfoProvider>
+            </div>
+          </Form>
+        </OperationContext.Provider>
       </Drawer>
     </div>
   )

packages/ui/src/forms/fields/Blocks/BlockRow.tsx

@@ -56,7 +56,6 @@ export const BlockRow: React.FC<BlockFieldProps> = ({
   listeners,
   moveRow,
   path: parentPath,
-  schemaPath,
   permissions,
   readOnly,
   removeRow,

packages/ui/src/providers/Auth/HydrateClientUser/index.tsx

@@ -1,21 +0,0 @@
-'use client'
-
-import type { Permissions, User } from 'payload/auth'
-
-import { useEffect } from 'react'
-
-import { useAuth } from '..'
-
-export const HydrateClientUser: React.FC<{ permissions: Permissions; user: User }> = ({
-  permissions,
-  user,
-}) => {
-  const { setPermissions, setUser } = useAuth()
-
-  useEffect(() => {
-    setUser(user)
-    setPermissions(permissions)
-  }, [user, permissions, setUser, setPermissions])
-
-  return null
-}

packages/ui/src/providers/DocumentInfo/index.tsx

@@ -51,10 +51,6 @@ export const DocumentInfoProvider: React.FC<
   const [unpublishedVersions, setUnpublishedVersions] =
     useState<PaginatedDocs<TypeWithVersion<any>>>(null)
 
-
-
-  const [title, setTitle] = useState<string>('')
-
   const [title, setTitle] = useState<string>('')
 
   const baseURL = `${serverURL}${api}`
@@ -77,7 +73,7 @@ export const DocumentInfoProvider: React.FC<
     }
   }
 
-  const [docPermissions, setDocPermissions] = useState<DocumentPermissions>(permissions[pluralType][slug])
+  const [docPermissions, setDocPermissions] = useState<DocumentPermissions>(null)
 
   const getVersions = useCallback(async () => {
     let versionFetchURL
@@ -225,14 +221,14 @@ export const DocumentInfoProvider: React.FC<
           'Accept-Language': i18n.language,
         },
       })
-      try {
-        const json = await res.json()
-        setDocPermissions(json)
-      } catch (e) {
-        console.error('Unable to fetch document permissions', e)
-      }
+      const json = await res.json()
+      setDocPermissions(json)
+    } else {
+      // fallback to permissions from the entity type
+      // (i.e. create has no id)
+      setDocPermissions(permissions?.[pluralType]?.[slug])
     }
-  }, [serverURL, api, pluralType, slug, id, i18n.language, code])
+  }, [serverURL, api, pluralType, slug, id, permissions, i18n.language, code])
 
   const getDocPreferences = useCallback(async () => {
     return getPreference<DocumentPreferences>(preferencesKey)
@@ -279,13 +275,13 @@ export const DocumentInfoProvider: React.FC<
 
   const value: DocumentInfoContext = {
     ...documentInfo,
+    docConfig,
     docPermissions,
     getDocPermissions,
     getDocPreferences,
     getVersions,
     publishedDoc,
     setDocFieldPreferences,
-    docConfig,
     setDocumentInfo,
     setDocumentTitle,
     title,