Skip to content

Commit

Permalink
HP-269 Feat/button redirect (#884)
Browse files Browse the repository at this point in the history
* Quickly swap out access selector for column filter

* Add Export to Workspace button

* Studies are not selectable unless user has access

* Restore border to study description

* Add export buttons

* Post to manifestservice when Export to Workspace button is clicked

* Fix bug with config variable scope

* Update mock config with file manifests

* Implement 'Download Manifest' button

* [WIP] Support content_type: link

* Add content_type: link

* Redirect to workspace page on Export to Workspace click

* Configure whether Disco page is behind login

* Revert breaking config change

* Fix bug preventing multiple files from being selected

- Steps to reproduce (heal preprod):
  - Search for 'jcoin' and select that study
  - See 1 study selected
  - Search for 'bacpac' and select that study
  - Expect 2 studies selected, get 1 study selected

- Cause: table selection onChange handler sets selected resources to be
whatever's currently selected in the table. If search or filtering has removed
a selected row in the table, the onChange handler will happily drop it, as
even though it was selected it's no longer in the table.

- Fix: ~~Update table selection onChange handler to work by deselecting / selecting
a single row at a time.~~ Actually it turns out there's a one-line config change
that also fixes the issue :angry-haha:

* Remove old code and fix errors

* Fix tests

* Fix style issues

* Adv search open/close

* Merge master

* [WIP] Filter sliding animation and stick to viewport

* [WIP] Filtering logic

* Set filter state

* Filter based on selections

* Combine filters with AND

* Hide locks if authz field is missing

* Hide Adv Search Filters button if not enabled

* Warn instead of crashing if adv search filters field is missing

* Update style: search bar

* Update font

* Update style: adjust font sizes and margins to compress header

* Update style: advanced search button

* Update style: advanced search button and export to workspace button

* Tweak header style to match prototype

* [WIP] Update table style to match prototype

* Warn instead of crash if malformed filterField

* Fix eslint

* Update table style to match prototype

- Hide border between row and study desc row
- Negative margin hack to move study desc row up
- Fix bottom border
- Remove hover state

* Make table scrollable when advanced search filters are open

* Enable search over fields not present in table

* [WIP] Study description page pops in from right

* [WIP] Improve study description page

- [x] Study desc page pops in from right
- [x] Field styles match prototype
- [ ] Permalink button matches prototype
- [ ] Tags match prototype
- [ ] Study description is expandable
- [ ] Close button matches prototype

* [WIP] Improve study description page

- [x] Study desc page pops in from right
- [x] Field styles match prototype
- [ ] Permalink button matches prototype
- [ ] Tags match prototype
- [ ] Study description is expandable
- [ ] Close button matches prototype

* [WIP] Improve study description page

- [x] Study desc page pops in from right
- [x] Field styles match prototype
- [ ] Permalink button matches prototype
- [x] Tags match prototype
- [ ] Study description is expandable
- [ ] Close button matches prototype

* [WIP] Improve study description page

- [x] Study desc page pops in from right
- [x] Field styles match prototype
- [ ] Permalink button matches prototype
- [x] Tags match prototype
- [ ] Study description is expandable
- [ ] Close button matches prototype
- [x] Handle display of long fields

* Clean up unused code

* New study description page

- [x] Study desc page pops in from right
- [x] Field styles match prototype
- [x] Tags match prototype
- [x] Close button matches prototype
- [x] Permalink button matches prototype
- [x] Handle display of long fields

- TODO Study description is expandable

* Fix table row highlight visual bug

- Use a CSS hack (::after element behind the expanded row, which has a transparent background)

* Fix visual bug: pagination not visible

* Fix visual bug: top of third study description line visible in table

* change label 'Unaccessible' to 'No Access'

* change n/a logic

* change label to 'Access Required'

* fix unit test

* remove bhc from testSchema

* fix stylelint

* heal bundle without home page

* Delete portal_config.md

* fix

* fix

* fix unit test

* fix: adv filter overflow

* Mitigate table row CSS bug in Safari

- In Safari, table rows overhang the bottom.
- Seems to be caused by absolutely positioned ::after element -- in Chrome,
  it seems that `bottom: -35px` puts the ::after element right below the
  element it's attached to, but on Safari, `bottom: -35px` puts the ::after
  element on the bottom of the *container* element (the `table body`!)
- Mitigated by changing table background to the same gray as the rows,
  and hiding the ::after elements at the bottom of the <tbody> element
  behind the pagination element.

* fix: row color

* fix: empty component

* fix: css

* fix: css

* fix: more css

* feat: tag scroll

* fix lint

* feat: scroll tag reset

* feat: sort tag

* chore: rebase

* chore: pkg

* chore: 8 tags

* chore: no more beta

* fix: search crash

* fix: css

* fix: checkbox

* feat: button redirect to login

* update

* fix: tests

* fix: travis

* update lock

Co-authored-by: Michael Ingram <mpingram@uchicago.edu>
Co-authored-by: haraprasadj <haraprasadj@uchicago.edu>
  • Loading branch information
3 people authored Jul 12, 2021
1 parent c86eb02 commit 5aba683
Show file tree
Hide file tree
Showing 7 changed files with 242 additions and 57 deletions.
113 changes: 106 additions & 7 deletions package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@gen3/ui-component": "^0.10.0",
"@storybook/addon-actions": "^5.0.0",
"@storybook/react": "^5.0.0",
"@types/redux-mock-store": "^1.0.3",
"antd": "^4.10.0",
"brace": "^0.10.0",
"clipboard-plus": "^1.0.0",
Expand Down Expand Up @@ -49,6 +50,7 @@
"less-loader": "^4.1.0",
"lodash": "^4.17.11",
"mapbox-gl": "^1.9.1",
"mock-local-storage": "^1.0.5",
"moment": "^2.22.2",
"node-fetch": "^2.6.1",
"npm": "^6.14.7",
Expand Down Expand Up @@ -101,6 +103,7 @@
"@types/core-js": "^2.5.4",
"@types/enzyme": "^3.10.8",
"@types/jest": "^26.0.20",
"@types/react-redux": "^7.1.18",
"@types/regenerator-runtime": "^0.13.0",
"@typescript-eslint/eslint-plugin": "^4.14.0",
"@typescript-eslint/parser": "^4.14.0",
Expand All @@ -124,7 +127,6 @@
"html-webpack-plugin": "^3.2.0",
"jest": "^24.5.0",
"jest-localstorage-mock": "^2.3.0",
"mock-local-storage": "^1.0.5",
"prettier": "^1.4.4",
"react-hot-loader": "^1.3.0",
"react-test-renderer": "^16.8.6",
Expand Down
Loading

0 comments on commit 5aba683

Please sign in to comment.