From a45ab8bd7671be76f99e29852c739e858f47885c Mon Sep 17 00:00:00 2001
From: Jacob Fletcher <jacobsfletch@gmail.com>
Date: Mon, 17 Apr 2023 13:39:16 -0400
Subject: [PATCH 1/2] fix: corrects sidebar spacing in collection and global
 edit views #2478

---
 src/admin/components/views/Global/index.scss    | 17 +++++++++++++----
 .../views/collections/Edit/index.scss           | 14 +++++++++++---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/admin/components/views/Global/index.scss b/src/admin/components/views/Global/index.scss
index 42adf1f37c..badd3e11ee 100644
--- a/src/admin/components/views/Global/index.scss
+++ b/src/admin/components/views/Global/index.scss
@@ -66,13 +66,21 @@
 
   &__sidebar-fields {
     padding-right: $baseline;
-    margin-bottom: base(1);
+    display: flex;
+    flex-direction: column;
+    gap: $baseline;
 
     .preview-btn {
       display: inline-block;
-      margin-top: 0;
+      margin: 0;
       width: calc(50% - #{base(.5)});
     }
+
+    .render-fields {
+      & > *:last-child {
+        margin-bottom: 0;
+      }
+    }
   }
 
   &__document-actions {
@@ -202,8 +210,9 @@
     }
 
     &__sidebar-fields {
-      margin-bottom: base(1);
-      padding-top: base(1);
+      padding-top: 0;
+      padding-right: var(--gutter-h);
+      gap: base(0.5);
 
       .preview-btn {
         width: 100%;
diff --git a/src/admin/components/views/collections/Edit/index.scss b/src/admin/components/views/collections/Edit/index.scss
index 2b59167371..56072abb89 100644
--- a/src/admin/components/views/collections/Edit/index.scss
+++ b/src/admin/components/views/collections/Edit/index.scss
@@ -121,13 +121,21 @@
 
   &__sidebar-fields {
     padding-right: $baseline;
-    margin-bottom: base(1);
+    display: flex;
+    flex-direction: column;
+    gap: $baseline;
 
     .preview-btn {
       display: inline-block;
-      margin-top: 0;
+      margin: 0;
       width: calc(50% - #{base(.5)});
     }
+
+    .render-fields {
+      & > *:last-child {
+        margin-bottom: 0;
+      }
+    }
   }
 
   &__meta {
@@ -217,9 +225,9 @@
     }
 
     &__sidebar-fields {
-      margin-bottom: 0;
       padding-top: 0;
       padding-right: var(--gutter-h);
+      gap: base(0.5);
 
       .preview-btn {
         width: 100%;

From 78316d4ddc0215d67f0fa78312bf383cefcfa3cf Mon Sep 17 00:00:00 2001
From: Jacob Fletcher <jacobsfletch@gmail.com>
Date: Mon, 17 Apr 2023 13:43:31 -0400
Subject: [PATCH 2/2] chore: updates global versions test config

---
 test/versions/globals/Autosave.ts | 26 ++++++++++++++++++++------
 test/versions/globals/Draft.ts    | 26 ++++++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/test/versions/globals/Autosave.ts b/test/versions/globals/Autosave.ts
index 9e76309de2..cff806bedf 100644
--- a/test/versions/globals/Autosave.ts
+++ b/test/versions/globals/Autosave.ts
@@ -4,7 +4,9 @@ import { autoSaveGlobalSlug } from '../shared';
 const AutosaveGlobal: GlobalConfig = {
   slug: autoSaveGlobalSlug,
   label: 'Autosave Global',
-  preview: () => 'https://payloadcms.com',
+  admin: {
+    preview: () => 'https://payloadcms.com',
+  },
   versions: {
     max: 20,
     drafts: {
@@ -12,13 +14,25 @@ const AutosaveGlobal: GlobalConfig = {
     },
   },
   access: {
-    read: ({ draft, req: { user } }) => {
-      // To read a draft of this global, you need to be authenticated
-      if (draft) {
-        return Boolean(user);
+    read: ({ req: { user } }) => {
+      if (user) {
+        return true;
       }
 
-      return true;
+      return {
+        or: [
+          {
+            _status: {
+              equals: 'published',
+            },
+          },
+          {
+            _status: {
+              exists: false,
+            },
+          },
+        ],
+      };
     },
   },
   fields: [
diff --git a/test/versions/globals/Draft.ts b/test/versions/globals/Draft.ts
index a14864252b..a89718f69c 100644
--- a/test/versions/globals/Draft.ts
+++ b/test/versions/globals/Draft.ts
@@ -4,19 +4,33 @@ import { draftGlobalSlug } from '../shared';
 const DraftGlobal: GlobalConfig = {
   slug: draftGlobalSlug,
   label: 'Draft Global',
-  preview: () => 'https://payloadcms.com',
+  admin: {
+    preview: () => 'https://payloadcms.com',
+  },
   versions: {
     max: 20,
     drafts: true,
   },
   access: {
-    read: ({ draft, req: { user } }) => {
-      // To read a draft of this global, you need to be authenticated
-      if (draft) {
-        return Boolean(user);
+    read: ({ req: { user } }) => {
+      if (user) {
+        return true;
       }
 
-      return true;
+      return {
+        or: [
+          {
+            _status: {
+              equals: 'published',
+            },
+          },
+          {
+            _status: {
+              exists: false,
+            },
+          },
+        ],
+      };
     },
   },
   fields: [