Skip to content

Commit

Permalink
Merge HHS (#486)
Browse files Browse the repository at this point in the history
* Bump validator from 13.6.0 to 13.7.0

Bumps [validator](https://github.com/validatorjs/validator.js) from 13.6.0 to 13.7.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](validatorjs/validator.js@13.6.0...13.7.0)

---
updated-dependencies:
- dependency-name: validator
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* welcoming robots in certain situations

* Update known vulnerabilities

* trying a different approach in the config

* is this how we set vars?

* fix var name

* test on dev since sandbox does not do what I thought

* update trusworks with modal changes

* need to learn how to do bash

* more bash better

* for christmas sake

* testing complete

* fix bash script var names

* updated file uploader modal

* updated external resource modal

* move logic to circlci config

* awaken robot on prod

* Update .circleci/config.yml

Co-authored-by: Josh Salisbury <[email protected]>

* add approvedat migration

* update approvedAt on approval

* clean up constants, add new one

* add approved and created dates to fe landing page

* add approved and created date to csv download

* remove console statement

* fixing tests

* fixed modal unit tests

* updated my alert test

* fixed modal tests for external resource

* partial fixes for ui tests

* clean up prop type

* cleanup UI tests

* more unit test fixes for trussworks2

* idle modal test fixes

* add backend tests

* fixed accessibility issue and added test coverage

* add target populations to ar

* add approved and created date to ar, table css fixes

* fix failing ui test

* fix failing tooltip test

* unique id value

* update known issues

* fix axe

* Update known vulnerabilities

* fix axe again

* fix axe issues again

* try heading axe fix

* update test for axe

* update

* see if remvoing display none fixes issue

* hide headings

* limit number of headings

* added cusom accordion with heading size prop

* added test for accordion

* fix capitalizations while we're here

* fixes based on Kryss comments

* fix css bug w/checkboxes

* linter fixes

* audit vuln

* update ignored FE vulns

* writing FE tests

* change unlock report button css to outline

* working on more tests

* provide some missing UI tests

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: unknown <[email protected]>
Co-authored-by: Adam Levin <[email protected]>
Co-authored-by: Josh Salisbury <[email protected]>
Co-authored-by: Adam Levin <[email protected]>
  • Loading branch information
6 people authored Nov 15, 2021
1 parent 3fbe926 commit 1d127e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion frontend/src/pages/ApprovedActivityReport/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ export default function ApprovedActivityReport({ match, user }) {
: null}
<button type="button" className="usa-button no-print" disabled={modalRef && modalRef.current ? modalRef.current.modalIsOpen : false} onClick={() => window.print()}>Print to PDF</button>
{user && user.permissions && canUnlockReports(user)
? <ModalToggleButton type="button" className="usa-button usa-button--accent-warm no-print" modalRef={modalRef} opener>Unlock Report</ModalToggleButton>
? <ModalToggleButton type="button" className="usa-button usa-button--outline no-print" modalRef={modalRef} opener>Unlock report</ModalToggleButton>
: null}
</Grid>
<Modal
Expand Down

0 comments on commit 1d127e4

Please sign in to comment.