Merge pull request #202 from Eastern-Research-Group/develop

Merging v1.1 changes into staging

.github/workflows/dev.yml

@@ -87,7 +87,6 @@ jobs:
           PUBLIC_URL="$SERVER_URL" \
             REACT_APP_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
             REACT_APP_CLOUD_SPACE="$CLOUD_SPACE" \
-            REACT_APP_CSB_ENROLLMENT_PERIOD="$CSB_ENROLLMENT_PERIOD" \
             REACT_APP_FORMIO_BASE_URL="$FORMIO_BASE_URL" \
             REACT_APP_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
             npm run build

.github/workflows/proto.yml

@@ -86,7 +86,6 @@ jobs:
           PUBLIC_URL="$SERVER_URL" \
             REACT_APP_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
             REACT_APP_CLOUD_SPACE="$CLOUD_SPACE" \
-            REACT_APP_CSB_ENROLLMENT_PERIOD="$CSB_ENROLLMENT_PERIOD" \
             REACT_APP_FORMIO_BASE_URL="$FORMIO_BASE_URL" \
             REACT_APP_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
             npm run build

.github/workflows/staging.yml

@@ -87,7 +87,6 @@ jobs:
           PUBLIC_URL="$SERVER_URL" \
             REACT_APP_SERVER_BASE_PATH="$SERVER_BASE_PATH" \
             REACT_APP_CLOUD_SPACE="$CLOUD_SPACE" \
-            REACT_APP_CSB_ENROLLMENT_PERIOD="$CSB_ENROLLMENT_PERIOD" \
             REACT_APP_FORMIO_BASE_URL="$FORMIO_BASE_URL" \
             REACT_APP_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
             npm run build

app/client/.env.example

@@ -1,8 +1,6 @@
-# NOTE: For local development, set `REACT_APP_CSB_ENROLLMENT_PERIOD`,
-# `REACT_APP_FORMIO_BASE_URL`, and `REACT_APP_FORMIO_PROJECT_NAME` to the same
-# values used in the server app's `CSB_ENROLLMENT_PERIOD`, `FORMIO_BASE_URL`,
-# and `FORMIO_PROJECT_NAME` env variables. When deployed, a GitHub Actions
-# Workflow does this in the "build" npm script.
-REACT_APP_CSB_ENROLLMENT_PERIOD=
+# NOTE: For local development, set `REACT_APP_FORMIO_BASE_URL` and
+# `REACT_APP_FORMIO_PROJECT_NAME` to the same values used in the server app's
+# `FORMIO_BASE_URL` and `FORMIO_PROJECT_NAME` env variables. When deployed, a
+# GitHub Actions Workflow does this in the "build" npm script.
 REACT_APP_FORMIO_BASE_URL=
 REACT_APP_FORMIO_PROJECT_NAME=

app/client/src/components/dashboard.tsx

@@ -8,7 +8,6 @@ import icons from "uswds/img/sprite.svg";
 import {
   serverUrl,
   serverUrlForLinks,
-  enrollmentClosed,
   formioBaseUrl,
   formioProjectUrl,
   fetchData,
@@ -190,7 +189,9 @@ export default function Dashboard() {
             </Link>
           )}
 
-          {pathname.startsWith("/rebate") || enrollmentClosed ? (
+          {pathname.startsWith("/rebate") ||
+          (epaUserData.status === "success" &&
+            epaUserData.data?.enrollmentClosed) ? (
             <button
               className="margin-bottom-1 usa-button font-sans-2xs"
               disabled

app/client/src/config.tsx

@@ -2,17 +2,10 @@ const {
   NODE_ENV,
   REACT_APP_SERVER_BASE_PATH,
   REACT_APP_CLOUD_SPACE,
-  REACT_APP_CSB_ENROLLMENT_PERIOD,
   REACT_APP_FORMIO_BASE_URL,
   REACT_APP_FORMIO_PROJECT_NAME,
 } = process.env;
 
-if (!REACT_APP_CSB_ENROLLMENT_PERIOD) {
-  throw new Error(
-    "Required REACT_APP_CSB_ENROLLMENT_PERIOD environment variable not found."
-  );
-}
-
 if (!REACT_APP_FORMIO_BASE_URL) {
   throw new Error(
     "Required REACT_APP_FORMIO_BASE_URL environment variable not found."
@@ -52,8 +45,6 @@ export const serverUrlForLinks =
 export const cloudSpace =
   NODE_ENV === "development" ? "dev" : REACT_APP_CLOUD_SPACE || "";
 
-export const enrollmentClosed = REACT_APP_CSB_ENROLLMENT_PERIOD === "closed";
-
 export const formioBaseUrl = REACT_APP_FORMIO_BASE_URL;
 
 const formioProjectName = REACT_APP_FORMIO_PROJECT_NAME;
@@ -75,7 +66,7 @@ export const messages = {
   timeout:
     "For security reasons, you have been logged out due to 15 minutes of inactivity.",
   logout: "You have successfully logged out.",
-  csbEnrollmentClosed: "The CSB enrollment period is closed.",
+  enrollmentClosed: "The CSB enrollment period is closed.",
 };
 
 /**

app/client/src/contexts/user.tsx

@@ -11,6 +11,7 @@ type Props = {
 };
 
 type EpaUserData = {
+  enrollmentClosed: boolean;
   mail: string;
   memberof: string;
   exp: number;

app/client/src/routes/allRebates.tsx

@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import { Link } from "react-router-dom";
 import icons from "uswds/img/sprite.svg";
 // ---
-import { serverUrl, enrollmentClosed, fetchData, messages } from "../config";
+import { serverUrl, fetchData, messages } from "../config";
 import Loading from "components/loading";
 import Message from "components/message";
 import MarkdownContent from "components/markdownContent";
@@ -13,7 +13,7 @@ import { useFormsState, useFormsDispatch } from "contexts/forms";
 
 export default function AllRebates() {
   const { content } = useContentState();
-  const { samUserData } = useUserState();
+  const { epaUserData, samUserData } = useUserState();
   const { rebateFormSubmissions } = useFormsState();
   const dispatch = useFormsDispatch();
 
@@ -138,7 +138,9 @@ export default function AllRebates() {
                     <tr
                       key={_id}
                       className={
-                        state === "submitted" || enrollmentClosed
+                        state === "submitted" ||
+                        (epaUserData.status === "success" &&
+                          epaUserData.data?.enrollmentClosed)
                           ? "text-italic text-base-dark"
                           : ""
                       }

app/client/src/routes/existingRebate.tsx

@@ -12,7 +12,7 @@ import { useNavigate, useParams } from "react-router-dom";
 import { Formio, Form } from "@formio/react";
 import { cloneDeep, isEqual } from "lodash";
 // ---
-import { serverUrl, enrollmentClosed, fetchData } from "../config";
+import { serverUrl, fetchData } from "../config";
 import { getUserInfo } from "../utilities";
 import Loading from "components/loading";
 import Message from "components/message";
@@ -393,7 +393,8 @@ function ExistingRebateContent() {
           }}
           options={{
             readOnly:
-              submissionData.state === "submitted" || enrollmentClosed
+              submissionData.state === "submitted" ||
+              epaUserData.data.enrollmentClosed
                 ? true
                 : false,
             noAlerts: true,

app/client/src/routes/newRebate.tsx

@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import { DialogOverlay, DialogContent } from "@reach/dialog";
 import icons from "uswds/img/sprite.svg";
 // ---
-import { serverUrl, enrollmentClosed, messages, fetchData } from "../config";
+import { serverUrl, messages, fetchData } from "../config";
 import { getUserInfo } from "../utilities";
 import Loading from "components/loading";
 import Message from "components/message";
@@ -73,8 +73,8 @@ export default function NewRebate() {
         >
           <div className="usa-modal__content">
             <div className="usa-modal__main">
-              {enrollmentClosed ? (
-                <Message type="info" text={messages.csbEnrollmentClosed} />
+              {epaUserData.data.enrollmentClosed ? (
+                <Message type="info" text={messages.enrollmentClosed} />
               ) : activeSamRecords.length <= 0 ? (
                 <Message type="info" text={messages.samNoResults} />
               ) : (

app/server/app/routes/api.js

@@ -97,6 +97,7 @@ router.get("/helpdesk-access", ensureHelpdesk, (req, res) => {
 router.get("/epa-data", (req, res) => {
   // Explicitly return only required attributes from user info
   res.json({
+    enrollmentClosed: process.env.CSB_ENROLLMENT_PERIOD === "closed",
     mail: req.user.mail,
     memberof: req.user.memberof,
     exp: req.user.exp,