Skip to content

Commit

Permalink
Merge pull request #488 from USEPA/develop
Browse files Browse the repository at this point in the history
Sync staging with develop
  • Loading branch information
courtneymyers authored Sep 11, 2024
2 parents 3bea9c8 + 6a8962d commit 436b4f8
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 110 deletions.
90 changes: 8 additions & 82 deletions app/package-lock.json

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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"Devin Galloway <[email protected]>"
],
"devDependencies": {
"concurrently": "8.2.2",
"concurrently": "9.0.0",
"husky": "9.1.5",
"lint-staged": "15.2.10",
"prettier": "3.3.3",
Expand Down
9 changes: 8 additions & 1 deletion app/server/app/routes/help.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,15 @@ router.get("/formio/actions/:formId/:mongoId", (req, res) => {
return res.status(errorStatus).json({ message: errorMessage });
}

const submissionActionsUrl =
`${formioProjectUrl}/action` +
`?form=${formId}` +
`&submission=${mongoId}` +
`&sort=-modified` +
`&limit=1000000`;

axiosFormio(req)
.get(`${formioProjectUrl}/action?form=${formId}&submission=${mongoId}`)
.get(submissionActionsUrl)
.then((axiosRes) => axiosRes.data)
.then((actions) => res.json(actions))
.catch((error) => {
Expand Down
69 changes: 45 additions & 24 deletions app/server/package-lock.json

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

4 changes: 2 additions & 2 deletions app/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"jsforce": "3.4.1",
"jsonwebtoken": "9.0.2",
"log4js": "6.9.1",
"mongodb": "6.8.0",
"mongodb": "6.8.1",
"morgan": "1.10.0",
"passport": "0.7.0",
"passport-saml": "3.2.4"
},
"devDependencies": {
"eslint": "9.9.1",
"eslint": "9.10.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.2.1",
"nodemon": "3.1.4"
Expand Down

0 comments on commit 436b4f8

Please sign in to comment.