fix: incorrect version defaults

payloadcms · Apr 17, 2023 · 3f9bbe9 · 3f9bbe9
1 parent 086feaf
commit 3f9bbe9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 37 deletions.
diff --git a/src/admin/components/utilities/DocumentInfo/index.tsx b/src/admin/components/utilities/DocumentInfo/index.tsx
@@ -58,6 +58,7 @@ export const DocumentInfoProvider: React.FC<Props> = ({
   const getVersions = useCallback(async () => {
     let versionFetchURL;
     let publishedFetchURL;
+    let draftsEnabled = false;
     let shouldFetchVersions = false;
     let unpublishedVersionJSON = null;
     let versionJSON = null;
@@ -93,12 +94,14 @@ export const DocumentInfoProvider: React.FC<Props> = ({
     };
 
     if (global) {
+      draftsEnabled = Boolean(global?.versions?.drafts);
       shouldFetchVersions = Boolean(global?.versions);
       versionFetchURL = `${baseURL}/globals/${global.slug}/versions`;
       publishedFetchURL = `${baseURL}/globals/${global.slug}?${qs.stringify(publishedVersionParams)}`;
     }
 
     if (collection) {
+      draftsEnabled = Boolean(collection?.versions?.drafts);
       shouldFetchVersions = Boolean(collection?.versions);
       versionFetchURL = `${baseURL}/${collection.slug}/versions`;
 
@@ -122,15 +125,19 @@ export const DocumentInfoProvider: React.FC<Props> = ({
     }
 
     if (shouldFetch) {
-      let publishedJSON = await fetch(publishedFetchURL, {
-        credentials: 'include',
-        headers: {
-          'Accept-Language': i18n.language,
-        },
-      }).then((res) => res.json());
+      let publishedJSON;
+
+      if (draftsEnabled) {
+        publishedJSON = await fetch(publishedFetchURL, {
+          credentials: 'include',
+          headers: {
+            'Accept-Language': i18n.language,
+          },
+        }).then((res) => res.json());
 
-      if (collection) {
-        publishedJSON = publishedJSON?.docs?.[0];
+        if (collection) {
+          publishedJSON = publishedJSON?.docs?.[0];
+        }
       }
 
       if (shouldFetchVersions) {

diff --git a/src/collections/config/sanitize.ts b/src/collections/config/sanitize.ts
@@ -10,7 +10,6 @@ import getBaseUploadFields from '../../uploads/getBaseFields';
 import { formatLabels } from '../../utilities/formatLabels';
 import { defaults, authDefaults } from './defaults';
 import { Config } from '../../config/types';
-import { versionCollectionDefaults } from '../../versions/defaults';
 import baseVersionFields from '../../versions/baseFields';
 import TimestampsRequired from '../../errors/TimestampsRequired';
 import mergeBaseFields from '../../fields/mergeBaseFields';
@@ -40,12 +39,14 @@ const sanitizeCollection = (config: Config, collection: CollectionConfig): Sanit
         };
       }
 
-      if (sanitized.versions.drafts.autosave === true) sanitized.versions.drafts.autosave = {};
+      if (sanitized.versions.drafts.autosave === true) {
+        sanitized.versions.drafts.autosave = {
+          interval: 2000,
+        };
+      }
 
       sanitized.fields = mergeBaseFields(sanitized.fields, baseVersionFields);
     }
-
-    sanitized.versions = merge(versionCollectionDefaults, sanitized.versions);
   }
 
   if (sanitized.upload) {

diff --git a/src/globals/config/sanitize.ts b/src/globals/config/sanitize.ts
@@ -6,7 +6,6 @@ import { GlobalConfig, SanitizedGlobalConfig } from './types';
 import defaultAccess from '../../auth/defaultAccess';
 import baseVersionFields from '../../versions/baseFields';
 import mergeBaseFields from '../../fields/mergeBaseFields';
-import { versionGlobalDefaults } from '../../versions/defaults';
 
 const sanitizeGlobals = (collections: CollectionConfig[], globals: GlobalConfig[]): SanitizedGlobalConfig[] => {
   const sanitizedGlobals = globals.map((global) => {
@@ -42,12 +41,14 @@ const sanitizeGlobals = (collections: CollectionConfig[], globals: GlobalConfig[
           };
         }
 
-        if (sanitizedGlobal.versions.drafts.autosave === true) sanitizedGlobal.versions.drafts.autosave = {};
+        if (sanitizedGlobal.versions.drafts.autosave === true) {
+          sanitizedGlobal.versions.drafts.autosave = {
+            interval: 2000,
+          };
+        }
 
         sanitizedGlobal.fields = mergeBaseFields(sanitizedGlobal.fields, baseVersionFields);
       }
-
-      sanitizedGlobal.versions = merge(versionGlobalDefaults, sanitizedGlobal.versions);
     }
 
     // /////////////////////////////////

diff --git a/src/utilities/getEntityPolicies.ts b/src/utilities/getEntityPolicies.ts
@@ -146,7 +146,7 @@ export function getEntityPolicies<T extends Args>(args: T): ReturnType<T> {
         }
       } else if (field.fields) {
         executeFieldPolicies({
-          policiesObj: mutablePolicies,
+          policiesObj,
           fields: field.fields,
           operation,
           entityAccessPromise,
@@ -156,14 +156,14 @@ export function getEntityPolicies<T extends Args>(args: T): ReturnType<T> {
           if (tabHasName(tab)) {
             if (!mutablePolicies[tab.name]) mutablePolicies[tab.name] = { fields: {} };
             executeFieldPolicies({
-              policiesObj: mutablePolicies[tab.name].fields,
+              policiesObj: mutablePolicies[tab.name],
               fields: tab.fields,
               operation,
               entityAccessPromise,
             });
           } else {
             executeFieldPolicies({
-              policiesObj: mutablePolicies,
+              policiesObj,
               fields: tab.fields,
               operation,
               entityAccessPromise,

diff --git a/src/versions/defaults.ts b/src/versions/defaults.ts
diff --git a/test/access-control/e2e.spec.ts b/test/access-control/e2e.spec.ts
@@ -219,7 +219,7 @@ describe('access control', () => {
 
 async function createDoc(data: any): Promise<{ id: string }> {
   return payload.create({
-    collection: docLevelAccessSlug,
+    collection: slug,
     data,
   });
 }