Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync staging with develop #387

Merged
merged 101 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
9bd8612
Update generic error message
courtneymyers Jan 19, 2024
7b6fb34
Rename Submission component's ButtonLink to FormButtonLink
courtneymyers Jan 19, 2024
d03ea68
Update Submissions component with new PRF2023Submission component
courtneymyers Jan 19, 2024
0e626cb
Add initial prf2023 route component
courtneymyers Jan 22, 2024
c398e27
Move fetching of prf submissions into new formio utility function for…
courtneymyers Jan 22, 2024
596f94a
Move creation of a brand new prf submission into new formio utility f…
courtneymyers Jan 22, 2024
f8798a0
Update formio2023 server route file with route handler to create an P…
courtneymyers Jan 22, 2024
75facde
Update BAP query functions for getting 2022 PRF data to include rebat…
courtneymyers Jan 22, 2024
39e6c2e
Update BAP query functions for getting 2022 CRF data to include rebat…
courtneymyers Jan 22, 2024
8f9ae29
Add initial BAP query for fetching BAP data for the 2023 PRF
courtneymyers Jan 23, 2024
eb34c8d
Update BAP query for 2023 PRF data to include bus line item fields
courtneymyers Jan 23, 2024
c133ff5
Destructure entity fields in frfNew component
courtneymyers Jan 23, 2024
4b548e9
Add Id field to busRecordsQuery when querying for 2023 PRF data from …
courtneymyers Jan 24, 2024
82c4ebf
Update capitalization of fields queried in BAP queries
courtneymyers Jan 25, 2024
174ef51
Inline BAP_SAM_TABLE value
courtneymyers Jan 25, 2024
1976732
Inline BAP_FORMS_TABLE value
courtneymyers Jan 25, 2024
2da4803
Inline BAP_BUS_TABLE value
courtneymyers Jan 25, 2024
eed3aa2
Remove no longer used env variables
courtneymyers Jan 25, 2024
05b9b5a
Begin renaming variables used in BAP queries to be more clear
courtneymyers Jan 25, 2024
9b55a50
Continue renaming variables used in BAP queries to be more clear
courtneymyers Jan 25, 2024
6939186
Finish renaming variables used in BAP queries to be more clear
courtneymyers Jan 25, 2024
7c2766d
Update 2023 PRF external status for when funding is not approved to d…
courtneymyers Jan 25, 2024
da69fa9
Update data injected into a 2023 PRF submission, every time it's edit…
courtneymyers Jan 25, 2024
7d28d40
Update queryBapFor2022PRFData() to fetch 2023 FRF bus records contact…
courtneymyers Jan 25, 2024
6466e91
Move function for fetching an existing prf's schema and submission da…
courtneymyers Jan 26, 2024
ce71f58
Add commented out stub of CRF2023Submission component to submissions …
courtneymyers Jan 26, 2024
e301beb
Move function for updating an existing prf's submission data from For…
courtneymyers Jan 26, 2024
78960bd
Update formio2023 router to include routes for fetching and updating …
courtneymyers Jan 26, 2024
d4ebc61
Move function for deleting an existing prf's submission data from For…
courtneymyers Jan 26, 2024
6c78590
Update formio2023 router's /delete-prf-submission to call deletePRFSu…
courtneymyers Jan 26, 2024
3f146ec
Store rebateYear variable in formio2022 and formio2023 routes, so it …
courtneymyers Jan 26, 2024
0a857f2
Move function for fetching crf's submission data from Formio out of f…
courtneymyers Jan 26, 2024
c765f14
Correct 2023 PRF CSB rebate Id and entity combo key fields to be the …
courtneymyers Jan 26, 2024
e7fbb43
Update data injected into a brand new 2023 PRF submission to include …
courtneymyers Jan 26, 2024
f347dd3
Update existingOwnerRecord in fetchDataForPRFSubmission() to be set w…
courtneymyers Jan 26, 2024
fa4b369
Merge pull request #377 from USEPA/feature/integrate-2023-prf
courtneymyers Jan 26, 2024
f0ddba6
Update fields used in BAP queries for 2023 PRF data
courtneymyers Jan 29, 2024
60e158b
Merge pull request #378 from USEPA/feature/update-bap-query-fields
courtneymyers Jan 29, 2024
06f78d2
Update importing of types to include type keyword inside named import…
courtneymyers Jan 29, 2024
4679352
Add clsx
courtneymyers Jan 29, 2024
07ce01d
Wrap use of tailwindscss classes and other conditionally assigned cla…
courtneymyers Jan 29, 2024
5c4e1d6
Merge pull request #379 from USEPA/feature/apply-code-formatting-updates
courtneymyers Jan 29, 2024
63ad61d
Update name of field used in a brand new 2023 PRF submission for stor…
courtneymyers Jan 29, 2024
a7389f8
Merge pull request #380 from USEPA/feature/update-2023-prf-bus-max-re…
courtneymyers Jan 29, 2024
54859ce
Add env variable for 2023 change request form path
courtneymyers Jan 29, 2024
9ba4c78
Add server routes and formio requests for 2023 change request form
courtneymyers Jan 29, 2024
3cdc35c
Add custom hooks for fetching and returning change request form submi…
courtneymyers Jan 30, 2024
69c0449
Update useChangeRequestsQuery() to return the query result and update…
courtneymyers Jan 30, 2024
dd0128c
Add change request column and button link to 2023 table of submissions
courtneymyers Jan 30, 2024
99edba5
Simplify naming of button link components in Submissions component
courtneymyers Jan 30, 2024
9188e9d
Update ChangeRequestButton to post data when clicked, and update Load…
courtneymyers Jan 30, 2024
c0384fd
Update use of ChangeRequestButton to pass required data (e.g. comboKe…
courtneymyers Jan 30, 2024
cedfd54
Update shape of data posted in a new change request form submission, …
courtneymyers Jan 30, 2024
4f8ab3e
Add initial ChangeRequest2023 component and its corresponding route
courtneymyers Jan 30, 2024
d8e9799
Rename ChangeRequest2023 component to Change2023 and update it's rend…
courtneymyers Jan 30, 2024
79b088e
Update change request server/api routes
courtneymyers Jan 30, 2024
ac3f8e0
Add formio utility functions and API endpoints for fetching and updat…
courtneymyers Jan 30, 2024
629b2c6
Update field names passed into a new 2023 change request form submiss…
courtneymyers Jan 30, 2024
ed4105e
Update Change2023 component to render change request form
courtneymyers Jan 30, 2024
deb9456
Add static change-request-intro.md content, update content api to fet…
courtneymyers Jan 30, 2024
a0bf2ff
Update UserDashboard component's onFormPage to include change request…
courtneymyers Jan 30, 2024
6888478
Add static change-requests-intro.md and serve it in the content api
courtneymyers Feb 1, 2024
8817cdb
Add initial change request form table to user's dashboard
courtneymyers Feb 1, 2024
b2436b9
Update display of change request form table on user's dashboard (incl…
courtneymyers Feb 5, 2024
165f4e6
Update appearance of ChangeRequestButton to look more like a link
courtneymyers Feb 6, 2024
932f8b2
Reduce dashboard table text size a bit and reduce height of gaps betw…
courtneymyers Feb 6, 2024
e6bcc10
Remove static change-requests-intro.md file and updaet change request…
courtneymyers Feb 8, 2024
b0c9cbe
Remove change request status column from change requests table (as it…
courtneymyers Feb 8, 2024
25b3825
Add form type to change requests table
courtneymyers Feb 8, 2024
60e3147
Update route of change request form to use it's mongo id, instead of …
courtneymyers Feb 8, 2024
540f7ff
Update path to change request form submission user is redirected to u…
courtneymyers Feb 8, 2024
61aad62
Move creation of new change request form submissions into its own com…
courtneymyers Feb 8, 2024
e8874ab
Create modal to display change request 2023 form
courtneymyers Feb 9, 2024
6fab758
Add server routes and logic to fetch 2023 change request form schema
courtneymyers Feb 10, 2024
3e023e5
Update ChangeRequest2023Form to fetch form schema, and display form i…
courtneymyers Feb 10, 2024
4ddef80
Ensure change request submissions are re-fetched when a change reques…
courtneymyers Feb 10, 2024
a2abb10
Update change request form to not re-fetch form schema if it has alre…
courtneymyers Feb 10, 2024
0fef6ec
Update ChangeRequest2023Dialog to fix Formio form's select inputs not…
courtneymyers Feb 10, 2024
5a22e27
Rename change-request-intro.md to new-change-intro.md and create subm…
courtneymyers Feb 10, 2024
ae283ff
Update Change2023 component to render the form read-only, and remove …
courtneymyers Feb 10, 2024
bbb8e64
Remove server api route and function for updating a change request fo…
courtneymyers Feb 10, 2024
7ff6ad5
Add formio 2023 change request path env variable to GitHub Actions wo…
courtneymyers Feb 10, 2024
65e8ffe
Merge pull request #381 from USEPA/feature/integrate-2023-change-requ…
courtneymyers Feb 10, 2024
bb55da5
Update message shown if a user has no active SAM.gov records, and cli…
courtneymyers Feb 20, 2024
2903ad7
Merge pull request #382 from USEPA/feature/update-no-active-sam-message
courtneymyers Feb 20, 2024
2a8cec1
Remove no longer used BAP env variables in GitHub Workflow actions
courtneymyers Feb 20, 2024
e3de6c3
Merge pull request #383 from USEPA/feature/remove-env-variables
courtneymyers Feb 20, 2024
3a485ff
Update PRF2022Submission and CRF2022Submission components to store en…
courtneymyers Feb 20, 2024
fddb8e3
Merge pull request #384 from USEPA/feature/update-submissions-logic
courtneymyers Feb 20, 2024
df84834
Add epa theme files to public directory
courtneymyers Feb 21, 2024
dd26777
Add epa theme's common and scripts JS files
courtneymyers Feb 22, 2024
b12e7ea
Move epa_theme into themes directory to better match path on EPA's se…
courtneymyers Feb 22, 2024
06f9c0a
Add EPA's once.min.js as their theme's scripts.min.js depends on it
courtneymyers Feb 22, 2024
3fc7728
Update public index.html with latest EPA template changes
courtneymyers Feb 22, 2024
b4327b3
Remove old sprite.artifact.svg as it's now included with the other EP…
courtneymyers Feb 22, 2024
2057653
Remove importing of uswds css and js in App component, as it's no lon…
courtneymyers Feb 26, 2024
2c960e8
Update 404 template to reflect changes to public index.html file, add…
courtneymyers Feb 26, 2024
15f39f7
Merge pull request #385 from USEPA/feature/update-epa-template
courtneymyers Feb 26, 2024
068215a
Update site alert styles to work with latest EPA theme template changes
courtneymyers Feb 26, 2024
5492f59
Ensure aria label is still set for site alert
courtneymyers Feb 26, 2024
2753e79
Merge pull request #386 from USEPA/feature/update-site-alert-styles
courtneymyers Feb 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
FORMIO_2023_FRF_PATH: ${{ secrets.FORMIO_2023_FRF_PATH }}
FORMIO_2023_PRF_PATH: ${{ secrets.FORMIO_2023_PRF_PATH }}
FORMIO_2023_CRF_PATH: ${{ secrets.FORMIO_2023_CRF_PATH }}
FORMIO_2023_CHANGE_PATH: ${{ secrets.FORMIO_2023_CHANGE_PATH }}
FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
Expand All @@ -63,9 +64,6 @@ jobs:
BAP_URL: ${{ secrets.BAP_URL }}
BAP_USER: ${{ secrets.BAP_USER }}
BAP_PASSWORD: ${{ secrets.BAP_PASSWORD }}
BAP_SAM_TABLE: ${{ secrets.BAP_SAM_TABLE }}
BAP_FORMS_TABLE: ${{ secrets.BAP_FORMS_TABLE }}
BAP_BUS_TABLE: ${{ secrets.BAP_BUS_TABLE }}
AWS_ACCESS_KEY_ID: ${{ secrets.S3_PUBLIC_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_PUBLIC_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: ${{ secrets.S3_PUBLIC_REGION }}
Expand Down Expand Up @@ -142,6 +140,7 @@ jobs:
cf set-env $APP_NAME "FORMIO_2023_FRF_PATH" "$FORMIO_2023_FRF_PATH" > /dev/null
cf set-env $APP_NAME "FORMIO_2023_PRF_PATH" "$FORMIO_2023_PRF_PATH" > /dev/null
cf set-env $APP_NAME "FORMIO_2023_CRF_PATH" "$FORMIO_2023_CRF_PATH" > /dev/null
cf set-env $APP_NAME "FORMIO_2023_CHANGE_PATH" "$FORMIO_2023_CHANGE_PATH" > /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_API_KEY" "$FORMIO_API_KEY" > /dev/null
Expand All @@ -151,9 +150,6 @@ jobs:
cf set-env $APP_NAME "BAP_URL" "$BAP_URL" > /dev/null
cf set-env $APP_NAME "BAP_USER" "$BAP_USER" > /dev/null
cf set-env $APP_NAME "BAP_PASSWORD" "$BAP_PASSWORD" > /dev/null
cf set-env $APP_NAME "BAP_SAM_TABLE" "$BAP_SAM_TABLE" > /dev/null
cf set-env $APP_NAME "BAP_FORMS_TABLE" "$BAP_FORMS_TABLE" > /dev/null
cf set-env $APP_NAME "BAP_BUS_TABLE" "$BAP_BUS_TABLE" > /dev/null
cf set-env $APP_NAME "S3_PUBLIC_BUCKET" "$S3_PUBLIC_BUCKET" > /dev/null
cf set-env $APP_NAME "S3_PUBLIC_REGION" "$AWS_DEFAULT_REGION" > /dev/null

Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
FORMIO_2023_FRF_PATH: ${{ secrets.FORMIO_2023_FRF_PATH }}
FORMIO_2023_PRF_PATH: ${{ secrets.FORMIO_2023_PRF_PATH }}
FORMIO_2023_CRF_PATH: ${{ secrets.FORMIO_2023_CRF_PATH }}
FORMIO_2023_CHANGE_PATH: ${{ secrets.FORMIO_2023_CHANGE_PATH }}
FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
FORMIO_PROJECT_NAME: ${{ secrets.FORMIO_PROJECT_NAME }}
FORMIO_API_KEY: ${{ secrets.FORMIO_API_KEY }}
Expand All @@ -63,9 +64,6 @@ jobs:
BAP_URL: ${{ secrets.BAP_URL }}
BAP_USER: ${{ secrets.BAP_USER }}
BAP_PASSWORD: ${{ secrets.BAP_PASSWORD }}
BAP_SAM_TABLE: ${{ secrets.BAP_SAM_TABLE }}
BAP_FORMS_TABLE: ${{ secrets.BAP_FORMS_TABLE }}
BAP_BUS_TABLE: ${{ secrets.BAP_BUS_TABLE }}
AWS_ACCESS_KEY_ID: ${{ secrets.S3_PUBLIC_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_PUBLIC_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: ${{ secrets.S3_PUBLIC_REGION }}
Expand Down Expand Up @@ -142,6 +140,7 @@ jobs:
cf set-env $APP_NAME "FORMIO_2023_FRF_PATH" "$FORMIO_2023_FRF_PATH" > /dev/null
cf set-env $APP_NAME "FORMIO_2023_PRF_PATH" "$FORMIO_2023_PRF_PATH" > /dev/null
cf set-env $APP_NAME "FORMIO_2023_CRF_PATH" "$FORMIO_2023_CRF_PATH" > /dev/null
cf set-env $APP_NAME "FORMIO_2023_CHANGE_PATH" "$FORMIO_2023_CHANGE_PATH" > /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_API_KEY" "$FORMIO_API_KEY" > /dev/null
Expand All @@ -151,9 +150,6 @@ jobs:
cf set-env $APP_NAME "BAP_URL" "$BAP_URL" > /dev/null
cf set-env $APP_NAME "BAP_USER" "$BAP_USER" > /dev/null
cf set-env $APP_NAME "BAP_PASSWORD" "$BAP_PASSWORD" > /dev/null
cf set-env $APP_NAME "BAP_SAM_TABLE" "$BAP_SAM_TABLE" > /dev/null
cf set-env $APP_NAME "BAP_FORMS_TABLE" "$BAP_FORMS_TABLE" > /dev/null
cf set-env $APP_NAME "BAP_BUS_TABLE" "$BAP_BUS_TABLE" > /dev/null
cf set-env $APP_NAME "S3_PUBLIC_BUCKET" "$S3_PUBLIC_BUCKET" > /dev/null
cf set-env $APP_NAME "S3_PUBLIC_REGION" "$AWS_DEFAULT_REGION" > /dev/null

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ build

# Nuxt.js build / generate output
.nuxt
dist
# dist

# Gatsby files
.cache/
Expand Down
Loading
Loading