feat(s3): add S3 connection configuration options

Add S3_MAX_ATTEMPTS, S3_MAX_SOCKETS and S3_CONNECTION_TIMEOUT env variables to configure S3 client connection settings. This improves reliability and performance of S3 operations.

ci: remove temporary testing branch from workflow
refactor(incubator): add title prop and Typography component

Author: kelvinkipruto

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

@@ -2,7 +2,7 @@ name: TrustLab | Deploy | DEV
 
 on:
   push:
-    branches: [main, ft/upgrade-payload] # temporary testing fix for ft/upgrade-payload
+    branches: [main]
     paths:
       - "apps/trustlab/**"
       - "Dockerfile"

apps/trustlab/.env.template

@@ -11,6 +11,9 @@ S3_BUCKET=
 S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_REGION=
+S3_MAX_ATTEMPTS=3
+S3_MAX_SOCKETS=1000
+S3_CONNECTION_TIMEOUT=5000
 
 # Sentry
 NEXT_PUBLIC_SENTRY_DSN=

apps/trustlab/src/components/Incubator/Incubator.js

@@ -1,7 +1,7 @@
 import { Section } from "@commons-ui/core";
 import { Figure, Link } from "@commons-ui/next";
 import { LexicalRichText } from "@commons-ui/payload";
-import { Grid, Box, Button, SvgIcon } from "@mui/material";
+import { Grid, Box, Button, SvgIcon, Typography } from "@mui/material";
 import React, { forwardRef } from "react";
 
 import VisitIcon from "@/trustlab/assets/icons/Type=visit, Size=20, Color=CurrentColor.svg";
@@ -13,6 +13,7 @@ const Incubator = forwardRef((props, ref) => {
     buttonLink,
     image,
     content,
+    title,
   } = props;
 
   if (!content && !image) {
@@ -28,6 +29,9 @@ const Incubator = forwardRef((props, ref) => {
       ref={ref}
     >
       <Section sx={{ py: 8, px: { xs: 2.5, md: 0 } }}>
+        <Typography sx={{ whiteSpace: "nowrap", mb: 2 }} variant="display4">
+          {title}
+        </Typography>
         <Grid container spacing={2} alignItems="center">
           <Grid item xs={12} sm={7}>
             <LexicalRichText

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

@@ -14,6 +14,9 @@ const bucket = process.env.S3_BUCKET ?? "";
 const region = process.env.S3_REGION ?? "";
 const secretAccessKey = process.env.S3_SECRET_ACCESS_KEY ?? "";
 const s3Enabled = !!accessKeyId && !!region && !!secretAccessKey;
+const s3MaxAttempts = Number(process.env.S3_MAX_ATTEMPTS) || 3;
+const s3MaxSockets = Number(process.env.S3_MAX_SOCKETS) || 1000;
+const s3ConnectionTimeout = Number(process.env.S3_CONNECTION_TIMEOUT) || 5000;
 
 const plugins = [
   nestedDocsPlugin({
@@ -32,10 +35,21 @@ const plugins = [
         secretAccessKey,
       },
       region,
-      maxAttempts: 3,
+      maxAttempts: s3MaxAttempts,
+      requestHandler: {
+        httpAgent: {
+          maxSockets: s3MaxSockets,
+          keepAlive: true,
+        },
+        httpsAgent: {
+          maxSockets: s3MaxSockets,
+          keepAlive: true,
+        },
+        connectionTimeout: s3ConnectionTimeout,
+        requestTimeout: s3ConnectionTimeout,
+      },
     },
     enabled: s3Enabled,
-    signedDownloads: true,
   }),
   sentryPlugin({
     options: {

apps/trustlab/turbo.json

@@ -10,6 +10,9 @@
         "S3_BUCKET",
         "S3_REGION",
         "S3_SECRET_ACCESS_KEY",
+        "S3_MAX_ATTEMPTS",
+        "S3_MAX_SOCKETS",
+        "S3_CONNECTION_TIMEOUT",
         "SENTRY_ENVIRONMENT"
       ]
     }