Merge pull request #1033 from CodeForAfrica/promise-tracker-update

Fix Promise Tracker UI Breaking imports
CodeForAfrica · Jan 31, 2025 · 519afd8 · 519afd8
2 parents 0506a94 + ced7006
commit 519afd8
Show file tree

Hide file tree

Showing 122 changed files with 540 additions and 1,510 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -913,3 +913,79 @@ USER nextjs
 # server.js is created by next build from the standalone output
 # https://nextjs.org/docs/pages/api-reference/next-config-js/output
 CMD ["node", "apps/vpnmanager/server.js"]
+
+# ============================================================================
+# Promise Tracker
+# ============================================================================
+
+#
+# promisetracker-desp: image with all pesayetu dependencies
+# -----------------------------------------------------
+
+FROM base-deps AS promisetracker-deps
+
+COPY apps/promisetracker/package.json ./apps/promisetracker/package.json
+
+# Use virtual store: https://pnpm.io/cli/fetch#usage-scenario
+RUN pnpm --filter "./apps/promisetracker" install --offline --frozen-lockfile
+
+#
+# promisetracker-builder: image that uses deps to build shippable output
+# ------------------------------------------------------------------
+
+FROM base-builder AS promisetracker-builder
+
+ARG NEXT_TELEMETRY_DISABLED \
+  # Next.js / Payload (build time)
+  PORT \
+  # Next.js (runtime)
+  NEXT_PUBLIC_APP_NAME="Promise Tracker" \
+  NEXT_PUBLIC_APP_URL \
+  NEXT_PUBLIC_SENTRY_DSN \
+  NEXT_PUBLIC_SEO_DISABLED \
+  NEXT_PUBLIC_GOOGLE_ANALYTICS \
+  # Sentry (build time)
+  SENTRY_AUTH_TOKEN \
+  SENTRY_ENVIRONMENT \
+  SENTRY_ORG \
+  SENTRY_PROJECT
+
+# This is in app-builder instead of base-builder just incase app-deps adds deps
+COPY --from=promisetracker-deps /workspace/node_modules ./node_modules
+
+COPY --from=promisetracker-deps /workspace/apps/promisetracker/node_modules ./apps/promisetracker/node_modules
+
+COPY apps/promisetracker ./apps/promisetracker
+
+RUN --mount=type=secret,id=sentry_auth_token,env=SENTRY_AUTH_TOKEN \
+  pnpm --filter "./apps/promisetracker" build
+
+#
+# promisetracker-runner: final deployable image
+# -----------------------------------------
+
+FROM base-runner AS promisetracker-runner
+
+ARG API_SECRET_KEY
+RUN set -ex \
+  # Create nextjs cache dir w/ correct permissions
+  && mkdir -p ./apps/promisetracker/.next \
+  && chown nextjs:nodejs ./apps/promisetracker/.next
+
+# PNPM
+# symlink some dependencies
+COPY --from=promisetracker-builder --chown=nextjs:nodejs /workspace/node_modules ./node_modules
+
+# Next.js
+# Public assets
+COPY --from=promisetracker-builder --chown=nextjs:nodejs /workspace/apps/promisetracker/public ./apps/promisetracker/public
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=promisetracker-builder --chown=nextjs:nodejs /workspace/apps/promisetracker/.next/standalone ./apps/promisetracker
+COPY --from=promisetracker-builder --chown=nextjs:nodejs /workspace/apps/promisetracker/.next/static ./apps/promisetracker/.next/static
+USER nextjs
+
+# server.js is created by next build from the standalone output
+# https://nextjs.org/docs/pages/api-reference/next-config-js/output
+CMD ["node", "apps/promisetracker/server.js"]
diff --git a/Makefile b/Makefile
@@ -39,3 +39,6 @@ techlabblog:
 vpnmanager:
 	$(COMPOSE_BUILD_ENV) $(COMPOSE) --env-file apps/vpnmanager/.env.local up vpnmanager --build
 
+promisetracker:
+	$(COMPOSE_BUILD_ENV) $(COMPOSE) --env-file apps/promisetracker/.env.local up promisetracker --build
+
diff --git a/apps/promisetracker/instrumentation.js b/apps/promisetracker/instrumentation.js
@@ -0,0 +1,7 @@
+// Next.js requires this to be exported as register https://nextjs.org/docs/app/building-your-application/optimizing/instrumentation
+// eslint-disable-next-line import/prefer-default-export
+export async function register() {
+  if (process.env.NEXT_RUNTIME === "nodejs") {
+    await import("./sentry.server.config");
+  }
+}
diff --git a/apps/promisetracker/next.config.js b/apps/promisetracker/next.config.js
@@ -8,7 +8,7 @@ const outputFileTracingRoot = PROJECT_ROOT
   : undefined;
 
 const moduleExports = {
-  experimental: {
+  experimental: outputFileTracingRoot && {
     outputFileTracingRoot,
   },
   i18n: {
@@ -55,18 +55,6 @@ const moduleExports = {
       },
     ];
   },
-
-  // Optional build-time configuration options
-  sentry: {
-    // See the 'Configure Source Maps' and 'Configure Legacy Browser Support'
-    // sections below for information on the following options:
-    //   - disableServerWebpackPlugin
-    //   - disableClientWebpackPlugin
-    //   - hideSourceMaps
-    //   - widenClientFileUpload
-    //   - transpileClientSDK
-    hideSourceMaps: false,
-  },
 };
 
 const sentryWebpackPluginOptions = {
@@ -79,6 +67,10 @@ const sentryWebpackPluginOptions = {
   silent: true, // Suppresses all logs
   // For all available options, see:
   // https://github.com/getsentry/sentry-webpack-plugin#options.
+  hideSourceMaps: true,
+  org: process.env.SENTRY_ORG,
+  authToken: process.env.SENTRY_AUTH_TOKEN,
+  project: process.env.SENTRY_PROJECT,
 };
 
 // Make sure adding Sentry options is the last code to run before exporting, to

diff --git a/apps/promisetracker/package.json b/apps/promisetracker/package.json
@@ -31,6 +31,7 @@
     "@mui/material": "catalog:mui-styles",
     "@mui/styles": "catalog:mui-styles",
     "@mui/utils": "catalog:mui-styles",
+    "@mui/private-theming": "catalog:mui-styles",
     "@sentry/nextjs": "catalog:",
     "clsx": "catalog:",
     "date-fns": "catalog:",

diff --git a/apps/promisetracker/src/components/AboutPage/Partners.js b/apps/promisetracker/src/components/AboutPage/Partners.js
@@ -59,8 +59,4 @@ Partners.propTypes = {
   items: PropTypes.arrayOf(PropTypes.shape({})),
 };
 
-Partners.defaultProps = {
-  items: undefined,
-};
-
 export default Partners;
diff --git a/apps/promisetracker/src/components/AboutPage/PromiseCriteria.js b/apps/promisetracker/src/components/AboutPage/PromiseCriteria.js
@@ -36,9 +36,4 @@ PromiseCriteria.propTypes = {
   items: PropTypes.arrayOf(PropTypes.shape({})),
 };
 
-PromiseCriteria.defaultProps = {
-  items: undefined,
-  title: undefined,
-};
-
 export default PromiseCriteria;
diff --git a/apps/promisetracker/src/components/AboutPage/index.js b/apps/promisetracker/src/components/AboutPage/index.js
@@ -127,17 +127,4 @@ AboutPage.propTypes = {
   title: PropTypes.string,
 };
 
-AboutPage.defaultProps = {
-  actNow: undefined,
-  actNowEnabled: undefined,
-  content: undefined,
-  criteria: undefined,
-  description: undefined,
-  featuredImage: undefined,
-  footer: undefined,
-  navigation: undefined,
-  partners: undefined,
-  title: undefined,
-};
-
 export default AboutPage;
diff --git a/apps/promisetracker/src/components/ActNow/index.js b/apps/promisetracker/src/components/ActNow/index.js
@@ -161,10 +161,4 @@ ActNow.propTypes = {
   title: PropTypes.string,
 };
 
-ActNow.defaultProps = {
-  actionLabel: undefined,
-  description: undefined,
-  title: undefined,
-};
-
 export default ActNow;
diff --git a/apps/promisetracker/src/components/ActNowCard/BaseContent.js b/apps/promisetracker/src/components/ActNowCard/BaseContent.js
@@ -43,10 +43,4 @@ BaseCard.propTypes = {
   children: PropTypes.node,
 };
 
-BaseCard.defaultProps = {
-  onCloseCard: undefined,
-  description: undefined,
-  children: undefined,
-};
-
 export default BaseCard;
diff --git a/apps/promisetracker/src/components/ActNowCard/ConnectCard.js b/apps/promisetracker/src/components/ActNowCard/ConnectCard.js
@@ -7,7 +7,7 @@ import useStyles from "./useStyles";
 
 import CtAButton from "@/promisetracker/components/CtAButton";
 
-function ConnectCard({ closeCard, promiseActNow }) {
+function ConnectCard({ closeCard, promiseActNow = { connect: {} } }) {
   const {
     connect: {
       connect_title: connectTitle,
@@ -49,14 +49,4 @@ ConnectCard.propTypes = {
   }),
 };
 
-ConnectCard.defaultProps = {
-  promiseActNow: PropTypes.shape({
-    connect: {
-      connectTitle: null,
-      connectDescription: null,
-      connectButton: null,
-    },
-  }),
-};
-
 export default ConnectCard;
diff --git a/apps/promisetracker/src/components/ActNowCard/FollowCard.js b/apps/promisetracker/src/components/ActNowCard/FollowCard.js
@@ -7,7 +7,7 @@ import useStyles from "./useStyles";
 
 import CtAButton from "@/promisetracker/components/CtAButton";
 
-function FollowCard({ closeCard, promiseActNow }) {
+function FollowCard({ closeCard, promiseActNow = { follow: {} } }) {
   const classes = useStyles();
 
   const {
@@ -58,14 +58,4 @@ FollowCard.propTypes = {
   }),
 };
 
-FollowCard.defaultProps = {
-  promiseActNow: PropTypes.shape({
-    follow: {
-      followTitle: null,
-      followDescription: null,
-      followButton: null,
-    },
-  }),
-};
-
 export default FollowCard;
diff --git a/apps/promisetracker/src/components/ActNowCard/PetitionCard.js b/apps/promisetracker/src/components/ActNowCard/PetitionCard.js
@@ -2,7 +2,7 @@ import { Grid, Snackbar } from "@mui/material";
 import Alert from "@mui/material/Alert";
 import Router from "next/router";
 import { useSession } from "next-auth/react";
-import PropTypes, { string } from "prop-types";
+import PropTypes from "prop-types";
 import React, { useState } from "react";
 
 import BaseContent from "./BaseContent";
@@ -11,7 +11,11 @@ import useStyles from "./useStyles";
 import CtAButton from "@/promisetracker/components/CtAButton";
 import FormDialog from "@/promisetracker/components/FormDialog";
 
-function PetitionCard({ closeCard, promiseActNow, ...props }) {
+function PetitionCard({
+  closeCard,
+  promiseActNow = { petition: { petitionTitle: "", petitionDescription: "" } },
+  ...props
+}) {
   const {
     petition: {
       petition_title: petitionTitle,
@@ -104,16 +108,4 @@ PetitionCard.propTypes = {
   }),
 };
 
-PetitionCard.defaultProps = {
-  petitionJoin: null,
-  petitionStart: null,
-  petitionTitle: string,
-  promiseActNow: PropTypes.shape({
-    petition: {
-      petitionTitle: null,
-      petitionDescription: null,
-    },
-  }),
-};
-
 export default PetitionCard;
diff --git a/apps/promisetracker/src/components/ActNowCard/ShareCard.js b/apps/promisetracker/src/components/ActNowCard/ShareCard.js
@@ -10,7 +10,7 @@ import React from "react";
 import BaseContent from "./BaseContent";
 import useStyles from "./useStyles";
 
-function ShareCard({ closeCard, promiseActNow }) {
+function ShareCard({ closeCard, promiseActNow = { share: {} } }) {
   const classes = useStyles();
 
   const {
@@ -58,13 +58,4 @@ ShareCard.propTypes = {
   }),
 };
 
-ShareCard.defaultProps = {
-  promiseActNow: PropTypes.shape({
-    share: {
-      shareTitle: null,
-      shareDescription: null,
-    },
-  }),
-};
-
 export default ShareCard;
diff --git a/apps/promisetracker/src/components/ActNowCard/index.js b/apps/promisetracker/src/components/ActNowCard/index.js
@@ -17,7 +17,10 @@ import useStyles from "./useStyles";
 
 import UpdateFormDialog from "@/promisetracker/components/FormDialog/UpdateDialog";
 
-function ActNowButtonCard({ promise_act_now: promiseActNow, ...props }) {
+function ActNowButtonCard({
+  promise_act_now: promiseActNow = { act_now: {} },
+  ...props
+}) {
   const {
     act_now: {
       act_now_title: actNowTitle,
@@ -162,17 +165,4 @@ ActNowButtonCard.propTypes = {
   }),
 };
 
-ActNowButtonCard.defaultProps = {
-  promise_act_now: PropTypes.shape({
-    act_now: {
-      act_now_title: null,
-      connect_label: null,
-      petition_label: null,
-      follow_label: null,
-      update_label: null,
-      share_label: null,
-    },
-  }),
-};
-
 export default ActNowButtonCard;
diff --git a/apps/promisetracker/src/components/ActNowPage/LoggedIn.js b/apps/promisetracker/src/components/ActNowPage/LoggedIn.js
@@ -104,12 +104,4 @@ ActNowLoggedInPage.propTypes = {
   title: PropTypes.string,
 };
 
-ActNowLoggedInPage.defaultProps = {
-  footer: undefined,
-  navigation: undefined,
-  ownedPetitions: undefined,
-  signedPetitions: undefined,
-  title: undefined,
-};
-
 export default ActNowLoggedInPage;
diff --git a/apps/promisetracker/src/components/ActNowPage/index.js b/apps/promisetracker/src/components/ActNowPage/index.js
@@ -232,13 +232,4 @@ ActNow.propTypes = {
   title: PropTypes.string,
 };
 
-ActNow.defaultProps = {
-  actNow: null,
-  description: null,
-  footer: null,
-  navigation: null,
-  petitions: null,
-  title: null,
-};
-
 export default ActNow;
diff --git a/apps/promisetracker/src/components/ActNowSummary/index.js b/apps/promisetracker/src/components/ActNowSummary/index.js
@@ -62,9 +62,4 @@ ActNowSummary.propTypes = {
   }),
 };
 
-ActNowSummary.defaultProps = {
-  summary: undefined,
-  titles: undefined,
-};
-
 export default ActNowSummary;
diff --git a/apps/promisetracker/src/components/ActionDialog/index.js b/apps/promisetracker/src/components/ActionDialog/index.js
@@ -89,13 +89,4 @@ ActionDialog.propTypes = {
   title: PropTypes.string,
 };
 
-ActionDialog.defaultProps = {
-  children: undefined,
-  description: undefined,
-  name: undefined,
-  onClose: undefined,
-  open: undefined,
-  title: undefined,
-};
-
 export default ActionDialog;