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.

Sign up for GitHub

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

Jump to bottom

Sync staging with develop #481

Merged
merged 8 commits into from
Sep 5, 2024
Merged

Sync staging with develop #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0688f3f
Add new NCES API routes and deprecate old NCES API route in OpenAPI docs
courtneymyers Sep 5, 2024
ce3e5ab
Add all new 2024 FRF and Change Request Form API routes to the OpenAP…
courtneymyers Sep 5, 2024
9d21689
Add 2024 FRF status API endpoint
courtneymyers Sep 5, 2024
745b828
Add API status routes for 2023 and 2024 Change Request forms and add …
courtneymyers Sep 5, 2024
43a4524
Merge pull request #479 from USEPA/feature/update-api-status-routes-a…
courtneymyers Sep 5, 2024
14b4cd7
Update app version number
courtneymyers Sep 5, 2024
b80bb29
Update APP_VERSION in 'Production Build' GitHub workflow
courtneymyers Sep 5, 2024
9aaa084
Merge pull request #480 from USEPA/feature/update-app-version-number
courtneymyers Sep 5, 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
2 changes: 1 addition & 1 deletion .github/workflows/production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

# Set environment variables
env:
APP_VERSION: 5.0.2
APP_VERSION: 6.0.0
CLOUD_SPACE: production
SERVER_BASE_PATH: /csb
FORMIO_BASE_URL: ${{ secrets.FORMIO_BASE_URL }}
Expand Down
4 changes: 2 additions & 2 deletions app/client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "epa-csb-rebate-forms-app-client",
"version": "5.0.2",
"version": "6.0.0",
"description": "U.S. EPA CSB Rebate Forms Application (client app)",
"homepage": ".",
"license": "CC0-1.0",
Expand Down
4 changes: 2 additions & 2 deletions app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "epa-csb-rebate-forms-app",
"version": "5.0.2",
"version": "6.0.0",
"description": "U.S. EPA CSB Rebate Forms Application",
"license": "CC0-1.0",
"author": "USEPA (https://www.epa.gov)",
Expand Down
65 changes: 65 additions & 0 deletions app/server/app/routes/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,69 @@ router.get("/formio/2023/prf", (req, res) => {
// });
// });

router.get("/formio/2023/change", (req, res) => {
axiosFormio(req)
.get(formUrl["2023"].change)
.then((axiosRes) => axiosRes.data)
.then((schema) => {
return res.json({ status: verifySchema(schema) });
})
.catch((_error) => {
// NOTE: error is logged in axiosFormio response interceptor
return res.json({ status: false });
});
});

router.get("/formio/2024/frf", (req, res) => {
axiosFormio(req)
.get(formUrl["2024"].frf)
.then((axiosRes) => axiosRes.data)
.then((schema) => {
return res.json({ status: verifySchema(schema) });
})
.catch((_error) => {
// NOTE: error is logged in axiosFormio response interceptor
return res.json({ status: false });
});
});

// router.get("/formio/2024/prf", (req, res) => {
// axiosFormio(req)
// .get(formUrl["2024"].prf)
// .then((axiosRes) => axiosRes.data)
// .then((schema) => {
// return res.json({ status: verifySchema(schema) });
// })
// .catch((_error) => {
// // NOTE: error is logged in axiosFormio response interceptor
// return res.json({ status: false });
// });
// });

// router.get("/formio/2024/crf", (req, res) => {
// axiosFormio(req)
// .get(formUrl["2024"].crf)
// .then((axiosRes) => axiosRes.data)
// .then((schema) => {
// return res.json({ status: verifySchema(schema) });
// })
// .catch((_error) => {
// // NOTE: error is logged in axiosFormio response interceptor
// return res.json({ status: false });
// });
// });

router.get("/formio/2024/change", (req, res) => {
axiosFormio(req)
.get(formUrl["2024"].change)
.then((axiosRes) => axiosRes.data)
.then((schema) => {
return res.json({ status: verifySchema(schema) });
})
.catch((_error) => {
// NOTE: error is logged in axiosFormio response interceptor
return res.json({ status: false });
});
});

module.exports = router;
4 changes: 2 additions & 2 deletions app/server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "epa-csb-rebate-forms-app-server",
"version": "5.0.2",
"version": "6.0.0",
"description": "U.S. EPA CSB Rebate Forms Application (server app)",
"license": "CC0-1.0",
"author": "USEPA (https://www.epa.gov)",
Expand Down
Loading