Merge pull request #732 from CodeForAfrica/fix/ui_sentry_environment_…

…name

SENTRY_ENVIRONMENT

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

@@ -17,7 +17,7 @@ env:
   DOKKU_REMOTE_URL: "ssh://[email protected]/charterafrica"
   IMAGE_NAME: "codeforafrica/charterafrica-ui"
   NEXT_PUBLIC_APP_URL: "https://charterafrica.dev.codeforafrica.org"
-  SENTRY_ENV: "development"
+  SENTRY_ENVIRONMENT: "development"
 
 jobs:
   deploy:
@@ -58,7 +58,7 @@ jobs:
             NEXT_PUBLIC_SENTRY_DSN=${{ secrets.CHARTERAFRICA_SENTRY_DSN }}
             PAYLOAD_SECRET_KEY=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-            SENTRY_ENV=${{ env.SENTRY_ENV }}
+            SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.CHARTERAFRICA_SENTRY_PROJECT }}
           cache-from: type=local,src=/tmp/.buildx-cache

.github/workflows/charterafrica-deploy-prod.yml

@@ -15,7 +15,7 @@ env:
   NEXT_PUBLIC_APP_URL: "https://charter.africa"
   NEXT_PUBLIC_SEO_DISABLED: "false"
   VERSION_FILE_NAME: "./apps/charterafrica/package.json"
-  SENTRY_ENV: "production"
+  SENTRY_ENVIRONMENT: "production"
 
 jobs:
   deploy:
@@ -87,7 +87,7 @@ jobs:
             NEXT_PUBLIC_SEO_DISABLED=${{ env.NEXT_PUBLIC_SEO_DISABLED }}
             PAYLOAD_SECRET_KEY=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-            SENTRY_ENV=${{ env.SENTRY_ENV }}
+            SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.CHARTERAFRICA_SENTRY_PROJECT }}
           cache-from: type=local,src=/tmp/.buildx-cache

.github/workflows/codeforafrica-deploy-dev-app.yml

@@ -19,7 +19,7 @@ env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   IMAGE_NAME: "codeforafrica/codeforafrica-ui"
   NEXT_PUBLIC_APP_URL: "https://codeforafrica-ui.dev.codeforafrica.org"
-  SENTRY_ENV: "development"
+  SENTRY_ENVIRONMENT: "development"
 
 jobs:
   deploy:
@@ -61,7 +61,7 @@ jobs:
             NEXT_PUBLIC_APP_LOGO_URL=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_LOGO_URL }}
             NEXT_PUBLIC_APP_NAME=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_NAME }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-            SENTRY_ENV=${{ env.SENTRY_ENV }}
+            SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.CODEFORAFRICA_SENTRY_PROJECT }}
           cache-from: type=local,src=/tmp/.buildx-cache

.github/workflows/codeforafrica-deploy-prod.yml

@@ -17,7 +17,7 @@ env:
   IMAGE_NAME: "codeforafrica/codeforafrica-ui"
   VERSION_FILE_NAME: "./apps/codeforafrica/package.json"
   NEXT_PUBLIC_APP_URL: "https://cfa.dev.codeforafrica.org"
-  SENTRY_ENV: "production"
+  SENTRY_ENVIRONMENT: "production"
 
 jobs:
   deploy:
@@ -82,7 +82,7 @@ jobs:
             NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
             PAYLOAD_SECRET=${{ secrets.CODEFORAFRICA_PAYLOAD_SECRET }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-            SENTRY_ENV=${{ env.SENTRY_ENV }}
+            SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.CODEFORAFRICA_SENTRY_PROJECT }}
           cache-from: type=local,src=/tmp/.buildx-cache

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

@@ -19,7 +19,7 @@ env:
   IMAGE_NAME: "codeforafrica/pesayetu-ui"
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   NEXT_PUBLIC_APP_URL: "https://pesayetu-ui.dev.codeforafrica.org"
-  SENTRY_ENV: "development"
+  SENTRY_ENVIRONMENT: "development"
 
 jobs:
   deploy:
@@ -63,7 +63,7 @@ jobs:
             JWT_SECRET_KEY=${{ secrets.PESAYETU_JWT_SECRET_KEY }}
             HURUMAP_API_URL=${{ secrets.PESAYETU_HURUMAP_API_URL }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-            SENTRY_ENV=${{ env.SENTRY_ENV }}
+            SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.PESAYETU_SENTRY_PROJECT }}
           cache-from: type=local,src=/tmp/.buildx-cache

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

@@ -19,7 +19,7 @@ env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   IMAGE_NAME: "codeforafrica/roboshield"
   NEXT_PUBLIC_APP_URL: "https://roboshield-ui.dev.codeforafrica.org"
-  SENTRY_ENV: "development"
+  SENTRY_ENVIRONMENT: "development"
 
 jobs:
   deploy:
@@ -60,7 +60,7 @@ jobs:
             NEXT_PUBLIC_SENTRY_DSN=${{ secrets.CHARTERAFRICA_SENTRY_DSN }}
             PAYLOAD_SECRET_KEY=${{ secrets.CHARTERAFRICA_PAYLOAD_SECRET_KEY }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-            SENTRY_ENV=${{ env.SENTRY_ENV }}
+            SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.ROBOSHIELD_SENTRY_PROJECT }}
           cache-from: type=local,src=/tmp/.buildx-cache

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

@@ -16,7 +16,7 @@ concurrency:
 env:
   DOKKU_REMOTE_URL: "ssh://[email protected]/vpnmanager"
   IMAGE_NAME: "codeforafrica/vpnmanager"
-  SENTRY_ENV: "development"
+  SENTRY_ENVIRONMENT: "development"
 
 jobs:
   deploy:
@@ -54,7 +54,7 @@ jobs:
           build-args: |
             SENTRY_DSN=${{ secrets.VPNMANAGER_SENTRY_DSN }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-            SENTRY_ENV=${{ env.SENTRY_ENV }}
+            SENTRY_ENVIRONMENT=${{ env.SENTRY_ENVIRONMENT }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.VPNMANAGER_SENTRY_PROJECT }}
           cache-from: type=local,src=/tmp/.buildx-cache

Dockerfile

@@ -16,7 +16,7 @@ ARG \
   NEXT_PUBLIC_GOOGLE_ANALYTICS="" \
   # Sentry (build time)
   SENTRY_AUTH_TOKEN \
-  SENTRY_ENV="" \
+  SENTRY_ENVIRONMENT="" \
   SENTRY_ORG \
   SENTRY_PROJECT
 
@@ -102,7 +102,7 @@ ENV NODE_ENV=production \
   NEXT_PUBLIC_SEO_DISABLED=${NEXT_PUBLIC_SEO_DISABLED} \
   NEXT_PUBLIC_GOOGLE_ANALYTICS=${NEXT_PUBLIC_GOOGLE_ANALYTICS} \
   PORT=${PORT} \
-  SENTRY_ENV=${SENTRY_ENV} \
+  SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT} \
   # set hostname to localhost
   HOSTNAME="0.0.0.0"
 
@@ -151,7 +151,7 @@ ARG NEXT_TELEMETRY_DISABLED \
   NEXT_PUBLIC_GOOGLE_ANALYTICS \
   # Sentry (build time)
   SENTRY_AUTH_TOKEN \
-  SENTRY_ENV \
+  SENTRY_ENVIRONMENT \
   SENTRY_ORG \
   SENTRY_PROJECT \
   # Wordpress
@@ -245,7 +245,7 @@ ARG NEXT_TELEMETRY_DISABLED \
   NEXT_PUBLIC_GOOGLE_ANALYTICS \
   # Sentry (build time)
   SENTRY_AUTH_TOKEN \
-  SENTRY_ENV \
+  SENTRY_ENVIRONMENT \
   SENTRY_ORG \
   SENTRY_PROJECT \
   SENTRY_LOG_LEVEL="info"

apps/charterafrica/.env

@@ -1,8 +1,8 @@
+MIGRATIONS_DIR=./migrations
 NEXT_PUBLIC_IMAGE_UNOPTIMIZED=true
-
 NEXT_PUBLIC_SEO_DISABLED=true
-
-PAYLOAD_PUBLIC_LOCALES="en, fr, pt"
 PAYLOAD_PUBLIC_DEFAULT_LOCALE=en
-MIGRATIONS_DIR=./migrations
-SENTRY_ENV=local
+PAYLOAD_PUBLIC_LOCALES="en, fr, pt"
+SENTRY_ENVIRONMENT=local
+SENTRY_ORG=code-for-africa
+SENTRY_PROJECT=charterafrica

apps/charterafrica/.env.template

@@ -38,6 +38,6 @@ SENDGRID_FROM_NAME
 
 # https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
 NEXT_PUBLIC_SENTRY_DSN=
-SENTRY_ENV=local|development|production
+SENTRY_ENVIRONMENT=local|development|production
 SENTRY_ORG=
 SENTRY_PROJECT=

apps/codeforafrica/.env

@@ -1,13 +1,12 @@
+MIGRATIONS_DIR=./migrations
+NEXT_PUBLIC_APP_DIRECTORY="apps/codeforafrica/"
 NEXT_PUBLIC_APP_LOGO_URL=https://res.cloudinary.com/code-for-africa/image/upload/v1656078512/codeforafrica/logos/CfA_logo_BW_twlmo6.png
 NEXT_PUBLIC_APP_NAME="Code for Africa"
 NEXT_PUBLIC_APP_URL="https://cfa.dev.codeforafrica.org"
+NEXT_PUBLIC_GOOGLE_ANALYTICS_ID="G-QVY4THBKNT"
 NEXT_PUBLIC_IMAGE_DOMAINS="longform.codeforafrica.org,res.cloudinary.com"
 NEXT_PUBLIC_IMAGE_UNOPTIMIZED="true"
 NEXT_PUBLIC_VERCEL_URL=${VERCEL_URL}
-NEXT_PUBLIC_APP_DIRECTORY="apps/codeforafrica/"
-NEXT_PUBLIC_GOOGLE_ANALYTICS_ID="G-QVY4THBKNT"
-MIGRATIONS_DIR=./migrations
-
-SENTRY_ENV=local
+SENTRY_ENVIRONMENT=local
 SENTRY_ORG=code-for-africa
 SENTRY_PROJECT=codeforafrica

apps/codeforafrica/env.template

@@ -22,6 +22,6 @@ S3_ACCESS_KEY_ID=
 # Sentry
 NEXT_PUBLIC_SENTRY_DSN=
 SENTRY_AUTH_TOKEN=
-SENTRY_ENV=
+SENTRY_ENVIRONMENT=
 SENTRY_ORG=
 SENTRY_PROJECT=

apps/pesayetu/.env

@@ -0,0 +1,3 @@
+SENTRY_ENVIRONMENT=local
+SENTRY_ORG=code-for-africa
+SENTRY_PROJECT=pesayetu

apps/roboshield/.env

@@ -1,3 +1,3 @@
-SENTRY_ENV=local
+SENTRY_ENVIRONMENT=local
 SENTRY_ORG=code-for-africa
 SENTRY_PROJECT=roboshield

apps/roboshield/.env.template

@@ -12,7 +12,7 @@ PORT
 # https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
 NEXT_PUBLIC_SENTRY_DSN=
 # Defaults to local
-SENTRY_ENV=local|development|staging|production
+SENTRY_ENVIRONMENT=local|development|staging|production
 # Defaults to code-for-africa
 SENTRY_ORG=
 # Defaults to roboshield

apps/roboshield/package.json

@@ -7,8 +7,8 @@
     "clean": "rm -rf .next .turbo node_modules",
     "dev": "next dev",
     "jest": "jest --passWithNoTests",
-    "lint": "TIMING=1 eslint --fix './'",
-    "lint-check": "TIMING=1 eslint './'",
+    "lint-check": "TIMING=1 next lint './'",
+    "lint": "TIMING=1 next lint --fix './'",
     "start": "next start"
   },
   "dependencies": {

apps/roboshield/src/components/Finish/Finish.tsx

@@ -2,7 +2,7 @@ import { Box, Snackbar } from "@mui/material";
 import { useEffect, useState } from "react";
 
 import Code from "../Code";
-import StepperNav from "../StepperNav";
+import StepperNav from "@/roboshield/components/StepperNav";
 
 import { useGlobalState } from "@/roboshield/context/GlobalContext";
 import { generateRobots } from "@/roboshield/lib/robots";

apps/roboshield/src/components/Footer/Footer.tsx

@@ -7,7 +7,7 @@ import NewsletterSubscription from "@/roboshield/components/NewsletterSubscripti
 import StayInTouch from "@/roboshield/components/StayInTouch";
 import FooterDescription from "./FooterDescription";
 
-interface FooterProps {
+export interface FooterProps {
   connect: {
     links: { url: string; platform: string }[];
     title: string;

apps/roboshield/src/components/Footer/index.ts

@@ -1,3 +1,5 @@
+import type { FooterProps } from "./Footer";
 import Footer from "./Footer";
 
+export type { FooterProps };
 export default Footer;

apps/roboshield/src/components/Page/Page.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 
-import Footer from "../Footer";
+import type { FooterProps } from "@/roboshield/components/Footer";
+import Footer from "@/roboshield/components/Footer";
 
 import NavBar from "@/roboshield/components/NavBar";
 
@@ -33,7 +34,7 @@ interface Footer {
 interface Props {
   children?: React.ReactNode;
   navbar?: Navbar;
-  footer?: Footer;
+  footer?: FooterProps;
 }
 function Page({ children, navbar, footer }: Props) {
   return (

apps/roboshield/src/components/Sitemaps/Sitemaps.tsx

@@ -1,7 +1,7 @@
 import { Box, TextareaAutosize } from "@mui/material";
 import { ChangeEvent, useState } from "react";
 
-import StepperNav from "../StepperNav";
+import StepperNav from "@/roboshield/components/StepperNav";
 
 import { useGlobalState } from "@/roboshield/context/GlobalContext";
 import { StepComponent } from "@/roboshield/types/stepComponent";

apps/roboshield/src/context/GlobalContext.tsx

@@ -1,6 +1,6 @@
 import React, { createContext, useState, useContext } from "react";
 
-import { Robot, robots } from "../lib/robots-data";
+import { Robot, robots } from "@/roboshield/lib/robots-data";
 
 export interface GlobalState {
   shouldFetch: boolean;

apps/roboshield/src/pages/index.tsx

@@ -18,10 +18,10 @@ import { useEffect } from "react";
 import React from "react";
 import { useRef, useState } from "react";
 
-import CodeEditor from "../components/Code/CodeEditor";
-import Delays from "../components/Delays";
-import Hero from "../components/Hero";
-import Sitemaps from "../components/Sitemaps";
+import CodeEditor from "@/roboshield/components/Code/CodeEditor";
+import Delays from "@/roboshield/components/Delays";
+import Hero from "@/roboshield/components/Hero";
+import Sitemaps from "@/roboshield/components/Sitemaps";
 
 import CommonBots from "@/roboshield/components/CommonBots";
 import CommonSettings from "@/roboshield/components/CommonSettings";

apps/vpnmanager/sentry.client.config.ts

@@ -3,7 +3,7 @@ import * as Sentry from "@sentry/nextjs";
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   tracesSampleRate: 1,
-  environment: process.env.SENTRY_ENV ?? "local",
+  environment: process.env.SENTRY_ENVIRONMENT ?? "local",
   debug: false,
   replaysOnErrorSampleRate: 1.0,
   replaysSessionSampleRate: 0.1,

apps/vpnmanager/sentry.edge.config.ts

@@ -2,7 +2,7 @@ import * as Sentry from "@sentry/nextjs";
 
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
-  environment: process.env.SENTRY_ENV ?? "local",
+  environment: process.env.SENTRY_ENVIRONMENT ?? "local",
   tracesSampleRate: 1,
   debug: false,
 });

apps/vpnmanager/sentry.server.config.ts

@@ -2,7 +2,7 @@ import * as Sentry from "@sentry/nextjs";
 
 const options = {
   dsn: process.env.SENTRY_DSN,
-  environment: process.env.SENTRY_ENV ?? "local",
+  environment: process.env.SENTRY_ENVIRONMENT ?? "local",
   tracesSampleRate: 1,
 };
 

charterafrica.Dockerfile

@@ -49,7 +49,7 @@ ARG NEXT_TELEMETRY_DISABLED=1 \
     PORT=3000 \
     # Sentry config for source maps upload (needed at build time only)
     SENTRY_AUTH_TOKEN="" \
-    SENTRY_ENV="" \
+    SENTRY_ENVIRONMENT="" \
     SENTRY_ORG="" \
     SENTRY_PROJECT="" \
     # Needed by Payload at Next.js build time (see below for Payload's own
@@ -99,7 +99,7 @@ ENV NODE_ENV=production \
     PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH} \
     PAYLOAD_PUBLIC_APP_URL=${PAYLOAD_PUBLIC_APP_URL} \
     PORT=${PORT} \
-    SENTRY_ENV=${SENTRY_ENV}
+    SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT}
 
 WORKDIR /workspace/apps/charterafrica
 

codeforafrica.Dockerfile

@@ -37,7 +37,7 @@ ARG PORT=3000 \
     NEXT_PUBLIC_SENTRY_DSN="" \
     # Sentry config for source maps upload (needed at build time only)
     SENTRY_AUTH_TOKEN="" \
-    SENTRY_ENV="" \
+    SENTRY_ENVIRONMENT="" \
     SENTRY_ORG="" \
     SENTRY_PROJECT=""
 
@@ -72,7 +72,7 @@ ENV NODE_ENV=production \
     NEXT_PUBLIC_APP_NAME=${NEXT_PUBLIC_APP_NAME} \
     NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL} \
     NEXT_PUBLIC_SENTRY_DSN=${NEXT_PUBLIC_SENTRY_DSN} \
-    SENTRY_ENV=${SENTRY_ENV}
+    SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT}
 
 WORKDIR /workspace/apps/codeforafrica
 

docker-compose.yml

@@ -22,7 +22,7 @@ services:
       PAYLOAD_SECRET_KEY: ${PAYLOAD_SECRET_KEY}
       SENTRY_AUTH_TOKEN: ${SENTRY_AUTH_TOKEN}
       SENTRY_ORG: ${SENTRY_ORG}
-      SENTRY_ENV: ${SENTRY_ENV}
+      SENTRY_ENVIRONMENT: ${SENTRY_ENVIRONMENT}
       SENTRY_PROJECT: ${SENTRY_PROJECT}
     ports:
       - 3000:3000
@@ -50,7 +50,7 @@ services:
       PAYLOAD_SECRET: ${PAYLOAD_SECRET}
       SENTRY_AUTH_TOKEN: ${SENTRY_AUTH_TOKEN}
       SENTRY_ORG: ${SENTRY_ORG}
-      SENTRY_ENV: ${SENTRY_ENV}
+      SENTRY_ENVIRONMENT: ${SENTRY_ENVIRONMENT}
       SENTRY_PROJECT: ${SENTRY_PROJECT}
     ports:
       - 3000:3000