Merge pull request #1175 from CodeForAfrica/chore/trustlab_improve_payload

@/trustlab payload improvements

Author: kilemensi

.github/workflows/build-docker-image.yml

@@ -32,7 +32,7 @@ jobs:
 
       # Add support for more platforms with QEMU (optional)
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/trustlab-deploy-dev.yml

@@ -36,7 +36,7 @@ jobs:
 
       # Add support for more platforms with QEMU (optional)
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/twoopstracker-deploy-dev.yml

@@ -39,7 +39,7 @@ jobs:
 
       # Add support for more platforms with QEMU (optional)
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

apps/trustlab/src/next-seo.config.js

@@ -9,11 +9,11 @@ const config = {
   openGraph: {
     type: "website",
     locale: "en_GB",
-    url: site.environmentUrl,
+    url: site.url,
     site_name: site.name,
     images: [
       {
-        url: `${site.environmentUrl}image.jpg`,
+        url: `${site.url}image.jpg`,
         width: 1600,
         height: 800,
         alt: site.name,

apps/trustlab/src/payload/access/abilities.js

@@ -21,7 +21,8 @@ export const canManageContent = (user) => {
 export const canManagePages = (user) =>
   checkRole([ROLE_ADMIN, ROLE_EDITOR], user);
 
-export const canManageSiteSettings = (user) => checkRole([ROLE_ADMIN], user);
+export const canManageSiteSettings = ({ req: { user } }) =>
+  checkRole([ROLE_ADMIN], user);
 
 // TODO(@kelvinkipruto): what happens on delete? cascade or not?
 export const canManageUsers = (user) => {

apps/trustlab/src/payload/access/index.js

@@ -0,0 +1,2 @@
+export * from "./anyone";
+export * from "./loggedIn";

apps/trustlab/src/payload/collections/Media.js

@@ -5,6 +5,7 @@ import { createdBy } from "@commons-ui/payload";
 
 import { canManageContent } from "@/trustlab/payload/access/abilities";
 import { anyone } from "@/trustlab/payload/access/anyone";
+import { hideAPIURL } from "@/trustlab/payload/utils";
 
 const filename = fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
@@ -19,7 +20,7 @@ const Media = {
   },
   admin: {
     group: "Publication",
-    hideAPIURL: true,
+    hideAPIURL,
   },
   fields: [
     {

apps/trustlab/src/payload/collections/Pages.js

@@ -3,6 +3,7 @@ import { slug, fullTitle } from "@commons-ui/payload";
 import { canManagePages } from "@/trustlab/payload/access/abilities";
 import { anyone } from "@/trustlab/payload/access/anyone";
 import TestBlock from "@/trustlab/payload/blocks/TestBlock";
+import { hideAPIURL } from "@/trustlab/payload/utils";
 
 const Pages = {
   slug: "pages",
@@ -16,7 +17,7 @@ const Pages = {
     defaultColumns: ["fullTitle", "updatedAt", "_status"],
     group: "Publication",
     useAsTitle: "title",
-    hideAPIURL: true,
+    hideAPIURL,
     preview: ({ slug: pageSlug }) => {
       const encodedParams = new URLSearchParams({
         slug: pageSlug,
@@ -47,7 +48,9 @@ const Pages = {
     },
   ],
   versions: {
-    drafts: true,
+    drafts: {
+      autosave: true,
+    },
   },
 };
 

apps/trustlab/src/payload/collections/Posts.js

@@ -2,6 +2,7 @@ import { slug, createdBy } from "@commons-ui/payload";
 
 import { canManageContent } from "@/trustlab/payload/access/abilities";
 import { anyone } from "@/trustlab/payload/access/anyone";
+import { hideAPIURL } from "@/trustlab/payload/utils";
 
 const Posts = {
   slug: "posts",
@@ -15,7 +16,7 @@ const Posts = {
     defaultColumns: ["title", "createdBy", "updatedAt", "_status"],
     group: "Publication",
     useAsTitle: "title",
-    hideAPIURL: true,
+    hideAPIURL,
     preview: ({ slug: pageSlug }) => {
       const encodedParams = new URLSearchParams({
         slug: pageSlug,

apps/trustlab/src/payload/globals/index.js

@@ -2,19 +2,22 @@ import EngagementTab from "./tabs/EngagementTab";
 import GeneralTab from "./tabs/GeneralTab";
 import NavigationTab from "./tabs/NavigationTab";
 
+import { loggedIn } from "@/trustlab/payload/access";
 import { canManageSiteSettings } from "@/trustlab/payload/access/abilities";
-import { anyone } from "@/trustlab/payload/access/anyone";
+import { hideAPIURL } from "@/trustlab/payload/utils";
 
 const SiteSettings = {
   slug: "site-settings",
   label: "Site",
   admin: {
     group: "Settings",
-    hideAPIURL: true,
+    hideAPIURL,
   },
   access: {
-    read: anyone,
-    update: ({ req: { user } }) => canManageSiteSettings(user),
+    // Since we're using Local APIs, we should still be able to pull data server-side
+    // See: note in https://payloadcms.com/docs/local-api/overview#transactions
+    read: loggedIn,
+    update: canManageSiteSettings,
   },
   fields: [
     {