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

Merging v1.1 changes into staging
USEPA · Jul 22, 2022 · 34f8a7d · 34f8a7d
2 parents fb38e7c + 2a771e9
commit 34f8a7d
Show file tree

Hide file tree

Showing 34 changed files with 2,075 additions and 2,691 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -41,10 +41,11 @@ jobs:
       # SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
       JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
+      CSB_ENROLLMENT_PERIOD: open
       FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
       FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
-      FORMIO_PROJECT_URL: ${{ secrets.FORMIO_PROJECT_URL }}
-      FORMIO_FORM_ID: ${{ secrets.FORMIO_FORM_ID }}
+      FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
+      FORMIO_FORM_NAME: ${{ secrets.FORMIO_FORM_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
@@ -86,8 +87,9 @@ 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_URL="$FORMIO_PROJECT_URL" \
+            REACT_APP_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
             npm run build
           rm ../server/app/public/index.html
           cd build
@@ -117,8 +119,10 @@ jobs:
           cf set-env $APP_NAME "SAML_PRIVATE_KEY" "$SAML_PRIVATE_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PUBLIC_KEY" "$JWT_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PRIVATE_KEY" "$JWT_PRIVATE_KEY" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PROJECT_URL" "$FORMIO_PROJECT_URL" > /dev/null
-          cf set-env $APP_NAME "FORMIO_FORM_ID" "$FORMIO_FORM_ID" > /dev/null
+          cf set-env $APP_NAME "CSB_ENROLLMENT_PERIOD" "$CSB_ENROLLMENT_PERIOD" > /dev/null
+          cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
+          cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
+          cf set-env $APP_NAME "FORMIO_FORM_NAME" "$FORMIO_FORM_NAME" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_ID" "$BAP_CLIENT_ID" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_SECRET" "$BAP_CLIENT_SECRET" > /dev/null

diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -40,10 +40,11 @@ jobs:
       SAML_PUBLIC_KEY: ${{ secrets.SAML_PUBLIC_KEY }}
       JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
+      CSB_ENROLLMENT_PERIOD: open
       FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
       FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
-      FORMIO_PROJECT_URL: ${{ secrets.FORMIO_PROJECT_URL }}
-      FORMIO_FORM_ID: ${{ secrets.FORMIO_FORM_ID }}
+      FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
+      FORMIO_FORM_NAME: ${{ secrets.FORMIO_FORM_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
@@ -85,8 +86,9 @@ 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_URL="$FORMIO_PROJECT_URL" \
+            REACT_APP_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
             npm run build
           rm ../server/app/public/index.html
           cd build
@@ -115,8 +117,10 @@ jobs:
           cf set-env $APP_NAME "SAML_PUBLIC_KEY" "$SAML_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PUBLIC_KEY" "$JWT_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PRIVATE_KEY" "$JWT_PRIVATE_KEY" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PROJECT_URL" "$FORMIO_PROJECT_URL" > /dev/null
-          cf set-env $APP_NAME "FORMIO_FORM_ID" "$FORMIO_FORM_ID" > /dev/null
+          cf set-env $APP_NAME "CSB_ENROLLMENT_PERIOD" "$CSB_ENROLLMENT_PERIOD" > /dev/null
+          cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
+          cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
+          cf set-env $APP_NAME "FORMIO_FORM_NAME" "$FORMIO_FORM_NAME" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_ID" "$BAP_CLIENT_ID" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_SECRET" "$BAP_CLIENT_SECRET" > /dev/null

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -41,10 +41,11 @@ jobs:
       SAML_PRIVATE_KEY: ${{ secrets.SAML_PRIVATE_KEY }}
       JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
+      CSB_ENROLLMENT_PERIOD: open
       FORMIO_PKG_AUTH_TOKEN: ${{ secrets.FORMIO_PKG_AUTH_TOKEN }}
       FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
-      FORMIO_PROJECT_URL: ${{ secrets.FORMIO_PROJECT_URL }}
-      FORMIO_FORM_ID: ${{ secrets.FORMIO_FORM_ID }}
+      FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
+      FORMIO_FORM_NAME: ${{ secrets.FORMIO_FORM_NAME }}
       FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
       BAP_CLIENT_ID: ${{ secrets.BAP_CLIENT_ID }}
       BAP_CLIENT_SECRET: ${{ secrets.BAP_CLIENT_SECRET }}
@@ -86,8 +87,9 @@ 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_URL="$FORMIO_PROJECT_URL" \
+            REACT_APP_FORMIO_PROJECT_NAME="$FORMIO_PROJECT_NAME" \
             npm run build
           rm ../server/app/public/index.html
           cd build
@@ -117,8 +119,10 @@ jobs:
           cf set-env $APP_NAME "SAML_PRIVATE_KEY" "$SAML_PRIVATE_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PUBLIC_KEY" "$JWT_PUBLIC_KEY" > /dev/null
           cf set-env $APP_NAME "JWT_PRIVATE_KEY" "$JWT_PRIVATE_KEY" > /dev/null
-          cf set-env $APP_NAME "FORMIO_PROJECT_URL" "$FORMIO_PROJECT_URL" > /dev/null
-          cf set-env $APP_NAME "FORMIO_FORM_ID" "$FORMIO_FORM_ID" > /dev/null
+          cf set-env $APP_NAME "CSB_ENROLLMENT_PERIOD" "$CSB_ENROLLMENT_PERIOD" > /dev/null
+          cf set-env $APP_NAME "FORMIO_BASE_URL" "$FORMIO_BASE_URL" > /dev/null
+          cf set-env $APP_NAME "FORMIO_PROJECT_NAME" "$FORMIO_PROJECT_NAME" > /dev/null
+          cf set-env $APP_NAME "FORMIO_FORM_NAME" "$FORMIO_FORM_NAME" > /dev/null
           cf set-env $APP_NAME "FORMIO_API_KEY" "$FORMIO_API_KEY" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_ID" "$BAP_CLIENT_ID" > /dev/null
           cf set-env $APP_NAME "BAP_CLIENT_SECRET" "$BAP_CLIENT_SECRET" > /dev/null

diff --git a/app/client/.env.example b/app/client/.env.example
@@ -1,6 +1,8 @@
-# NOTE: For local development, set `REACT_APP_FORMIO_BASE_URL` and
-# `REACT_APP_FORMIO_PROJECT_URL` to the same values used in the server app's
-# `FORMIO_BASE_URL` and `FORMIO_PROJECT_URL` env variables. When deployed, a
-# GitHub Actions Workflow does this in the "build" npm script.
+# 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=
 REACT_APP_FORMIO_BASE_URL=
-REACT_APP_FORMIO_PROJECT_URL=
+REACT_APP_FORMIO_PROJECT_NAME=