Revert "fix more type errors"

This reverts commit 4fc15b3.
payloadcms · Nov 20, 2024 · adadafc · adadafc
1 parent 4bc2eda
commit adadafc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/packages/ui/src/utilities/buildFormState.ts b/packages/ui/src/utilities/buildFormState.ts
@@ -221,7 +221,7 @@ export const buildFormState = async (
     fields,
     fieldSchemaMap,
     operation,
-    permissions: docPermissions === true ? docPermissions : docPermissions?.fields,
+    permissions: docPermissions?.fields || {},
     preferences: docPreferences || { fields: {} },
     previousFormState: formState,
     renderAllFields,

diff --git a/packages/ui/src/utilities/hasSavePermission.ts b/packages/ui/src/utilities/hasSavePermission.ts
@@ -20,18 +20,13 @@ export const hasSavePermission = (args: {
 
   if (collectionSlug) {
     return Boolean(
-      (isEditing && (docPermissions === true || docPermissions?.update)) ||
-        (!isEditing &&
-          (docPermissions === true ||
-            (docPermissions as Extract<SanitizedCollectionPermission, object>).create)),
+      (isEditing && docPermissions?.update) ||
+        (!isEditing && (docPermissions as SanitizedCollectionPermission)?.create),
     )
   }
 
   if (globalSlug) {
-    return Boolean(
-      docPermissions === true ||
-        (docPermissions as Extract<SanitizedGlobalPermission, object>)?.update,
-    )
+    return Boolean((docPermissions as SanitizedGlobalPermission)?.update)
   }
 
   return false

diff --git a/packages/ui/src/views/Edit/Auth/index.tsx b/packages/ui/src/views/Edit/Auth/index.tsx
@@ -57,18 +57,14 @@ export const Auth: React.FC<Props> = (props) => {
     const collection = permissions?.collections?.[collectionSlug]
 
     if (collection) {
-      return Boolean(
-        collection === true ? true : 'unlock' in collection ? collection.unlock : undefined,
-      )
+      return Boolean('unlock' in collection ? collection.unlock : undefined)
     }
 
     return false
   }, [permissions, collectionSlug])
 
   const apiKeyPermissions =
-    docPermissions === true || docPermissions?.fields === true
-      ? true
-      : docPermissions?.fields?.enableAPIKey
+    docPermissions?.fields === true ? true : docPermissions?.fields?.enableAPIKey
 
   const apiKeyReadOnly =
     readOnly ||
@@ -151,7 +147,7 @@ export const Auth: React.FC<Props> = (props) => {
           <EmailAndUsernameFields
             loginWithUsername={loginWithUsername}
             operation={operation}
-            permissions={docPermissions === true ? true : docPermissions?.fields}
+            permissions={docPermissions?.fields}
             readOnly={readOnly}
             t={t}
           />