@/trustlab payload improvements

.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: [
     {

apps/trustlab/src/payload/globals/tabs/EngagementTab.js

@@ -7,6 +7,8 @@ const EngagementTab = {
       name: "connect",
       type: "group",
       label: "Social Accounts",
+      // If localized is enabled at group level, no need for localized at nested field level
+      // https://payloadcms.com/docs/fields/group
       localized: true,
       fields: [
         {
@@ -21,7 +23,6 @@ const EngagementTab = {
                   "Text that appears on contact links e.g Stay in Touch",
               },
               required: true,
-              localized: true,
             },
             socialLinks(),
           ],
@@ -32,6 +33,7 @@ const EngagementTab = {
       name: "newsletter",
       type: "group",
       label: "Email Newsletter",
+      localized: true,
       fields: [
         {
           type: "collapsible",
@@ -41,7 +43,6 @@ const EngagementTab = {
               name: "title",
               type: "text",
               required: true,
-              localized: true,
             },
             {
               name: "embedCode",

apps/trustlab/src/payload/utils/hideAPIURL.js

@@ -0,0 +1,5 @@
+import { site } from "@/trustlab/utils";
+
+const hideAPIURL = site.environment === "production";
+
+export default hideAPIURL;

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

@@ -0,0 +1,3 @@
+export { default as hideAPIURL } from "./hideAPIURL";
+
+export default undefined;

apps/trustlab/src/utils/index.js

@@ -0,0 +1,3 @@
+export { default as site } from "./site";
+
+export default undefined;

apps/trustlab/src/utils/site.js

@@ -1,3 +1,6 @@
+const environment = (process.env.SENTRY_ENVIRONMENT ?? "local")
+  .trim()
+  .toLowerCase();
 const name = process.env.NEXT_PUBLIC_APP_NAME ?? "TrustLab";
 
 // see: https://developer.mozilla.org/en-US/docs/Web/API/URL/pathname
@@ -9,18 +12,11 @@ const ensureTrailingSlash = (string) => {
   return url.toString();
 };
 const url = ensureTrailingSlash(process.env.NEXT_PUBLIC_APP_URL);
-let environmentUrl = url;
-if (process.env.NEXT_PUBLIC_VERCEL_ENV === "preview") {
-  environmentUrl = ensureTrailingSlash(
-    `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`,
-  );
-}
 
 const site = {
-  environmentUrl,
+  environment,
   name,
   url,
-  logoUrl: process.env.NEXT_PUBLIC_APP_LOGO_URL,
 };
 
 export default site;

apps/trustlab/turbo.json

@@ -5,10 +5,11 @@
       "env": [
         "NEXT_RUNTIME",
         "PREVIEW_SECRET",
+        "S3_ACCESS_KEY_ID",
         "S3_BUCKET",
         "S3_REGION",
-        "S3_ACCESS_KEY_ID",
-        "S3_SECRET_ACCESS_KEY"
+        "S3_SECRET_ACCESS_KEY",
+        "SENTRY_ENVIRONMENT"
       ]
     }
   }