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

Scan and delete uploaded files, nodejs upgrade. #335

Merged
merged 90 commits into from
Mar 2, 2021
Merged
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
6021653
add file type filtering on the frontend
dcmcand Feb 22, 2021
7cfbfb3
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 22, 2021
d9e5f34
refactor to to add services/file.js
dcmcand Feb 22, 2021
b7c08f4
Add delete file route
dcmcand Feb 22, 2021
49e2860
add frontend changes
dcmcand Feb 22, 2021
7ebf561
fix fileUrl in fetchers/file.js
dcmcand Feb 22, 2021
69e29bb
add backend tests
dcmcand Feb 23, 2021
c374077
update frontend tests
dcmcand Feb 23, 2021
31055b7
add tests
dcmcand Feb 23, 2021
6bc1f35
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 23, 2021
c2a9193
add api documentation
dcmcand Feb 23, 2021
f70ac16
add api documentation
dcmcand Feb 23, 2021
60c95a1
fmt
dcmcand Feb 23, 2021
77ef865
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 23, 2021
ba075f7
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 24, 2021
f04bd3a
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 24, 2021
ff14fda
add confirmation modal for file deletion
dcmcand Feb 24, 2021
63d3aa1
styling
dcmcand Feb 24, 2021
adaa1ad
Add delete confirmation modal
dcmcand Feb 25, 2021
0798506
add tests for file delete modal
dcmcand Feb 25, 2021
af148bc
fmt
dcmcand Feb 25, 2021
c165a41
Squashed commit of the following:
dcmcand Feb 25, 2021
41de3bc
fmt
dcmcand Feb 25, 2021
71834d6
Squashed commit of the following:
dcmcand Feb 25, 2021
fb99b34
fix merge issue
dcmcand Feb 25, 2021
be55ad7
update return status for delete api to 204
dcmcand Feb 25, 2021
2835cf6
Squashed commit of the following:
dcmcand Feb 25, 2021
ef2168b
Squashed commit of the following:
dcmcand Feb 25, 2021
c9d20aa
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 25, 2021
a0b7532
add file type filtering on the frontend
dcmcand Feb 22, 2021
9548f15
refactor to to add services/file.js
dcmcand Feb 22, 2021
ddc7f54
Add delete file route
dcmcand Feb 22, 2021
63b4ed9
add frontend changes
dcmcand Feb 22, 2021
2be459b
fix fileUrl in fetchers/file.js
dcmcand Feb 22, 2021
ce32540
add backend tests
dcmcand Feb 23, 2021
b793060
update frontend tests
dcmcand Feb 23, 2021
84c9717
add tests
dcmcand Feb 23, 2021
744dd5d
add api documentation
dcmcand Feb 23, 2021
0b4b26d
add api documentation
dcmcand Feb 23, 2021
4ed635c
fmt
dcmcand Feb 23, 2021
bfafdc8
add confirmation modal for file deletion
dcmcand Feb 24, 2021
413c87d
styling
dcmcand Feb 24, 2021
8f6747a
Add delete confirmation modal
dcmcand Feb 25, 2021
31bac8e
add tests for file delete modal
dcmcand Feb 25, 2021
26956b3
fmt
dcmcand Feb 25, 2021
fe10580
Squashed commit of the following:
dcmcand Feb 25, 2021
55e2e57
Squashed commit of the following:
dcmcand Feb 25, 2021
5ab277c
fix merge issue
dcmcand Feb 25, 2021
10485c7
update return status for delete api to 204
dcmcand Feb 25, 2021
26887e4
Squashed commit of the following:
dcmcand Feb 25, 2021
16be599
Squashed commit of the following:
dcmcand Feb 25, 2021
43032e4
Clean up after merge
dcmcand Feb 25, 2021
3d716db
Merge branch 'cm-280-delete-files' of github.com:adhocteam/Head-Start…
dcmcand Feb 25, 2021
2c26821
clean up after merge
dcmcand Feb 25, 2021
71c8f75
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 25, 2021
6b74c8a
update frontend and api docs to deal with authorization
dcmcand Feb 25, 2021
0c840f9
fmt
dcmcand Feb 25, 2021
7dcf353
fix tests
dcmcand Feb 25, 2021
387bb73
fmt
dcmcand Feb 25, 2021
70365b6
fix 2 tests
dcmcand Feb 25, 2021
222ab9b
Add a docker services only option
rahearn Feb 25, 2021
f38101b
Update to nodejs 14.15.4
rahearn Feb 25, 2021
57386eb
Update dependencies
rahearn Feb 26, 2021
6396913
Deploy to sandbox
rahearn Feb 26, 2021
4cad3be
refactor for testability and add tests
dcmcand Feb 26, 2021
e0c7c96
refactor and fix tests
dcmcand Feb 26, 2021
10d507f
fmt
dcmcand Feb 26, 2021
53794b4
Merge branch 'main' into cm-280-delete-files
dcmcand Feb 26, 2021
4a02a2b
fix delete file bug
dcmcand Mar 1, 2021
001324e
Merge branch 'main' into cm-280-delete-files
dcmcand Mar 1, 2021
2e8b277
Merge branch 'main' into cm-280-delete-files
dcmcand Mar 1, 2021
1ba1f3a
fmt
dcmcand Mar 1, 2021
dc6acd5
add tls options for cloud.gov to redis
dcmcand Mar 1, 2021
91b25a1
allow empty object for tls config
dcmcand Mar 1, 2021
7d353e5
fix generateRedisConfig
dcmcand Mar 1, 2021
1ee704a
change clamav endpoint
dcmcand Mar 1, 2021
0ef1fa4
add focus to deleteFile modal
dcmcand Mar 1, 2021
39c4cce
add focus to delete file modal
dcmcand Mar 1, 2021
b7a09da
Merge branch 'main' into cm-280-delete-files
dcmcand Mar 2, 2021
ee254b6
Clean up postgres port assignments
rahearn Mar 2, 2021
2b6f903
Merge branch 'adhoc-main' into nodejs-update
rahearn Mar 2, 2021
94f3cfb
Lint fixes
rahearn Mar 2, 2021
75fd9cb
Fix frontend tests
rahearn Mar 2, 2021
7f47a2b
Merge branch 'main' into cm-fix-tls-for-redis
dcmcand Mar 2, 2021
092f32a
Merge pull request #203 from adhocteam/cm-fix-tls-for-redis
dcmcand Mar 2, 2021
05f697f
Merge branch 'main' into cm-280-delete-files
rahearn Mar 2, 2021
0a54784
Merge pull request #191 from adhocteam/cm-280-delete-files
dcmcand Mar 2, 2021
d5823eb
Merge branch 'adhoc-main' into nodejs-update
rahearn Mar 2, 2021
5a564d1
Update tests
rahearn Mar 2, 2021
d0f5a95
Merge pull request #201 from adhocteam/nodejs-update
rahearn Mar 2, 2021
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
Prev Previous commit
Next Next commit
fix generateRedisConfig
dcmcand committed Mar 1, 2021
commit 7d353e56dddb58ce74d111da56683d96b83d2596
8 changes: 4 additions & 4 deletions src/services/scanQueue.js
Original file line number Diff line number Diff line change
@@ -7,16 +7,16 @@ const generateRedisConfig = () => {
credentials: {
host,
port,
// TLS needs to be set to an empty object for redis on cloud.gov
// eslint-disable-next-line no-empty-pattern
redisOpts: { redis: { password, tls: {} } },
password,
},
}],
} = JSON.parse(process.env.VCAP_SERVICES);
return {
host,
port,
redisOpts: { redis: { password } },
// TLS needs to be set to an empty object for redis on cloud.gov
// eslint-disable-next-line no-empty-pattern
redisOpts: { redis: { password, tls: {} } },
};
}
const { REDIS_HOST: host, REDIS_PASS: password } = process.env;