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

Add topics/reasons, filters, and activity reports table to TTA record page, update robots.txt for lower environments, Update Trussworks 2.0, lower export CSV limit #614

Merged
merged 101 commits into from
Nov 16, 2021

Conversation

jasalisbury
Copy link
Contributor

@jasalisbury jasalisbury commented Nov 9, 2021

Description of change

394

  • pull bar graph into it's own component
  • bar graph now scrolls just the graph content, allows title/labels to still be shown when the graph is scrolled
  • add topic/reason freq widget. Can switch between display of reasons or topics
  • added backend test helpers to quickly (as in how long to code) create activity reports and destroy them for tests, along with any needed associations

396

  • Report table is now it's own component
  • Activity reports table replaced with new stand alone component
  • My alerts still needs to be updated to use new component. There are a few difference between the two tables that need to be handled. Saving for a later date to keep the change smaller
  • withWidgetData uses deep compare to prevent multiple renders
  • Moved table related tests from landing page to new component
  • Add report table to grantee dashboard

Only added functionality is the ability to show or hide the filter menu on report tables, and dynamically setting the table caption.

451

The approved activity report now shows target populations.

430

  • Added approvedAt as a database column. This is set to the most recent timestamp when the report status changed to approved. Otherwise it is null. Unlocking a report doesn't erase this column, but re-approving it afterwards does overwrite it.
  • Added created date to the my alerts widget on the activity-reports page
  • Added created date and approved date to the activity reports widget
  • Added both fields to the CSV (the same function generates exports for both tables - if there isn't an approval date, it will be blank)

276

robots.txt, the file that tells Google whether or not to index your website, now explicitly tells Google not to index our site in all environments except production.

345

Upgrade Trussworks component library to 2.0 version.

22

Unlock report button should now be outline CSS.

160

Based on accessibility review & code review, the limit for the CSV export was lowered to 2000 and some UI changes were incorporated to increase context and consistency.

301/404

Add filters and filter pills to the Grantee TTA record page

How to test

394

Browse to the grantee tta record page

396

View activity reports table on landing page. Check the following:

  • filters, changing regions
  • filters are preserved through region changes and regions through filter changes
  • correct results are displayed when filtering
  • download buttons still function
  • you can select individual and all reports
  • sorting still works
  • paging still works

View reports on the grantee TTA record page. Check the same as above. There won't be filter controls and the reports should be scoped to the current grantee.

430

View the tables on /activity-reports and export CSVs. Check that the fields described above are displayed, and that everything else appears correct.

451

Verify that target populations appears on the approved activity reports

345

Application components should behave as before. Additional testing can be spent on modal and accordion behavior.

22

View any approved report the Unlock report button should now have outline style.

160

Verify that no more than 2000 reports can be exported (and lesser exports work fine)

301/404

On the grantee TTA record page, verify that filters can be added and removed, and that they filter the data appropriately.

Issue(s)

Checklists

Every PR

  • Meets issue criteria
  • JIRA ticket status updated
  • Code is meaningfully tested
  • Meets accessibility standards (WCAG 2.1 Levels A, AA)
  • API Documentation updated
  • Boundary diagram updated
  • Logical Data Model updated
  • Architectural Decision Records written for major infrastructure decisions

Production Deploy

  • Staging smoke test completed

After merge/deploy

  • Update JIRA ticket status

jasalisbury and others added 24 commits November 2, 2021 16:38
 * pull bar graph into it's own component
 * bar graph now scrolls just the graph content, allows title/labels to
still be shown when the graph is scrolled
 * add topic/reason freq widget. Can switch between display of reasons
or topics
 * added backend test helpers to quickly (as in how long to code) create
activity reports and destroy them for tests, along with any needed associations
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]>
Move button outside of H2 tag. Graph is focusable (so scrollable with
keyboard)
 * Report table is now it's own component
 * Activity reports table replaced with new stand alone component
 * My alerts still needs to be updated to use new component. There are a
few difference between the two tables that need to be handled. Saving
for a later date to keep the change smaller
 * withWidgetData uses deep compare to prevent multiple renders
 * Moved table related tests from landing page to new component
 * Add report table to grantee dashboard
Conflicts:
	frontend/src/pages/GranteeRecord/index.js
	frontend/src/pages/GranteeRecord/pages/TTAHistory.js
…istory

Move report table to own component
AdamAdHocTeam and others added 20 commits November 11, 2021 15:59
* fix prop type

* db.sequelize.close returns a promise

* fix unit test

* building backend route for grantee search

* create query for search

* clean up function

* add unit test

* add size limit to query

* fix broken ui test

* update ui test for new features

* add another ui test

* beefed up unit test

* beefed up second unit test

* refactor fetching of widget data

* add granteeId to scopes

* remove unused file

* remove widgets example page

* add unit test

* fix broken test

* back end for grants list widget

* build out GranteeResults

* fixed placement of statistics to match mockup

* add grantee results table

* write ui test

* add additional ui tests

* backend fixes for grants program types

* backend unit tests

* update yarn vuln

* starting to fill test coverage gaps

* more work on ui tests

* return fetchers to prev state

* ui test for grantee search

* another ui test

* testing linter

* remove test

* test

* remove inline function

* fix bug where sort wasn't firing

* why not?

* removed shot in the dark

* test this lint

* test this lint

* on apply remove as a test

* defeated, we add no an eslint ignore

* updates wip

* fix unit tests

* linter fixes

* changes for grantee to use scopes with fixes

* finish UI tests

* more grantee list updates

* first version of grants list widget

* updates

* unit test for Grants List FE

* fix front end tests

* fix all backend tests

* minor ui update

* change ids to see if test passes

* updates

* fix ui

* add feature flag

* clean up feature flag component and some naming

* clean up fetcher

* clean up css

* rename determineFiltersToScopes to filtersToScopes

* cleanup feature flag usage

* filtering via model type

* leverage existing filter code

* more tweaking of feature flag

* add missing param

* add default sorting to grantee service

* update grantee service

* write unit tests for new scopes

* fix ui tests

* fix lint error

* fix backend unit tests

* fix lint errors

* feature flag grantee record

* refactor search endpoint to use new scopes

* fix issues with grantee record page

* fix flaky frontend test and iron out bugs with merge

* remove extraneous comment

* working on proper error handling;

* remove failing tests for now

* add back in unit tests

* simplify fetching data

* improve backend coverage

* no magic numbers

* add new tab components;

* new layout changes

* sensible defaults

* fix backend test

* wrote "a lot" of tests

* add to feature flag tests

* switch url structure

* remove unneeded error override prop

* fix indentation

* users can't set 'modelType'

* hoist Filter to its own scope

* rename granteebyScopes to granteeById

* refactor granteeById to use program table

* rename granteesByNameAndRegion

* required false on included model

* remove unneeded filter

* refactor loading logic for grantee search form

* remove unnecessary condition

* refactor programs on frontend

* fix some unit tests

* fix unit tests

* remove console logs

* create basic filter component

* rearranging componentry

* putting it all together

* add todo comment

* flopped those bad boys

* flopped menu item order

* add configurable fields to overview widget

* always show search results (simplify loading logic)

* show side nav as active when in any part of grantee record flow

* style changes

* refactor tooltips, add them to the overview widget

* fix back to search link

* fix grantee results page

* fix tooltip text wrap, screenreader on overview

* fix UI tests for grantee record page

* simplify filter management

* clean up filters some more

* further filter cleanup

* allow year to date as a filter option;

* add key to render, refactor components

* role filter should show overlap

* working out the kinks

* fix filter state and match mockup

* add keyboard handling and descriptive page titles

* further styling

* writing tests

* start unit tests

* trying to fix post merge mistakes

* fixing some merge mistakes

* add some UI test

* add additional unit tests

* fix botched backend test and add frontend test

* some small accessibility improvements

* add refactor plan

* begin refactoring

* refactor and seperate button select and date range select

* start another refactor

* refactor menu usage

* refactor dropdowns to use one component

* add test for grantee search

* cleanup TTA History filter

* convert filter menu to dropdown menu

* ui fixes after refactoring

* fix more ui bugs

* fill in some test coverage

* add filter menu item test

* get rid of duplicate constant

* add test for filter date range

* more test coverage

* fix bug with filter blurring

* fix blur interactions

* fix weird checkbox behavior

* bring date icons inline;

* reset condition on topic change

* remove debugging comment

* ditch unused code so we don\'t have to test it

* adapt test since query is killed by topic change

* write test for button select

* remove phantom state from checkbox select

* refactor formatDateRange function

* add test to date range select

* remove unused code from filter menu that we shouldnt test

* fix date range select label bug

* fix specialist select blur bug

* [TTAHUB-404] Add target populations to Grantee record page (#480)

* add label to input in search form

* create new widget front and back

* ui test

* put it in a grid

* fix ui test

* clean up tests

* radd scopes to goals for grant

* I put the where in the wrong place (oopsie)

* fix test

* Add SES to the diagram

* Add to ignored yarn vulnerabilities

Co-authored-by: unknown <[email protected]>

* fix weird blur behavior

* make grids agree

* resolve merge issues

* TTA-HUB: 397 Add Pill Filters to Grantee Page (#481)

* first version of filter pills

* added first version of filter pills

* added tests for filter pill ui

* change colors and add test

* fixed issues found by Matt

* fixed filter issues and specialists check boxes

* fixed pill row spacing and moved AND to front

* fix audit vuln

* fix lint errors

* wip

* css fixes

* code clean up

* added unit test for tool tip and fixed filter pill test

* align text in ellipsis pill

* fixes based on Joshs PR review

Co-authored-by: Matt Bevilacqua <[email protected]>

* neaten the prop types

* fighting against extra api calls

* clear out query on condition

* fix ui tests

* add column header test

* remove unneeded code

* add another ui test

* pass correct filters to the frequency graph

* fix weird useState

* refactor filter usage across TTA History

* apply filters to table as well

* add min width to menu

* remove all specialists as an option

* fix table colors

* fix grantee record ui test

* remove toggle all checked ui test

* fix other failing tests

* add test to column header

* test

* no div + caption

* cleanup test

* add test to mock

* lwrite a test that works

* we have to stop meeting like this

Co-authored-by: Adam Levin <[email protected]>
Co-authored-by: Adam Levin <[email protected]>
Co-authored-by: Josh Salisbury <[email protected]>
Co-authored-by: unknown <[email protected]>
[TTAHUB-451] Add target populations to approved report
…date-to-ar

[TTAHUB-430] add approved and created date to activity report tables
TTAHUB-345 Upgrade to Trussworks 2.0 Component Library
TTAHUB-22: Change unlock report button CSS to outline
* 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

* need to learn how to do bash

* more bash better

* for christmas sake

* testing complete

* fix bash script var names

* 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

* partial fixes for ui tests

* clean up prop type

* cleanup UI tests

* add backend tests

* add target populations to ar

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

* fix failing ui test

* fix failing tooltip test

* update known issues

* Update known vulnerabilities

* fix capitalizations while we're here

* fix css bug w/checkboxes

* update ignored FE vulns

* writing FE tests

* 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: Josh Salisbury <[email protected]>
@AdamAdHocTeam AdamAdHocTeam changed the title Add topics/reasons and activity reports table to TTA record page, update robots.txt for lower environments Add topics/reasons and activity reports table to TTA record page, update robots.txt for lower environments, Update Trussworks 2.0 Nov 15, 2021
thewatermethod and others added 3 commits November 15, 2021 12:00
* 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

* linter fixes

* audit vuln

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]>
* 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]>
[TTAHUB-160] final changes to export message from accessibility spec. and lowering limit
@thewatermethod thewatermethod changed the title Add topics/reasons and activity reports table to TTA record page, update robots.txt for lower environments, Update Trussworks 2.0 Add topics/reasons and activity reports table to TTA record page, update robots.txt for lower environments, Update Trussworks 2.0, lower export CSV limit Nov 15, 2021
thewatermethod and others added 2 commits November 15, 2021 15:23
* 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

* linter fixes

* audit vuln

* change unlock report button css to outline

* remove to be deleted files from test coverage

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]>
add filters and target populations table to grantee record page
@thewatermethod thewatermethod changed the title Add topics/reasons and activity reports table to TTA record page, update robots.txt for lower environments, Update Trussworks 2.0, lower export CSV limit Add topics/reasons, filters, and activity reports table to TTA record page, update robots.txt for lower environments, Update Trussworks 2.0, lower export CSV limit Nov 15, 2021
@PatricePascual-ACF PatricePascual-ACF merged commit 9995eb9 into production Nov 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants