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

[DT-783] Add study details page #2741

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Conversation

s-rubenstein
Copy link
Contributor

Addresses

Screen.Recording.2024-12-03.at.3.33.58.PM.mov

Summary


Have you read Terra's Contributing Guide lately? If not, do that first.

  • Label PR with a Jira ticket number and include a link to the ticket
  • Label PR with a security risk modifier [no, low, medium, high]
  • PR describes scope of changes
  • Get a minimum of one thumbs worth of review, preferably two if enough team members are available
  • Get PO sign-off for all non-trivial UI or workflow changes
  • Verify all tests go green
  • Test this change deployed correctly and works on dev environment after deployment

@s-rubenstein s-rubenstein requested a review from a team as a code owner December 3, 2024 20:38
@s-rubenstein s-rubenstein requested review from snf2ye and rjohanek and removed request for a team December 3, 2024 20:38
<AuthenticatedRoute path='/admin_manage_dar_collections/' component={AdminManageDarCollections} props={props} rolesAllowed={[USER_ROLES.admin]} />
<AuthenticatedRoute path='/datalibrary/:query' component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
<AuthenticatedRoute path='/datalibrary' component={DatasetSearch} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
<AuthenticatedRoute path='/studies/:studyId' component={StudyDetails} props={props} rolesAllowed={[USER_ROLES.admin, USER_ROLES.all]} />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only new line here, other than that its all linting

@@ -160,26 +160,26 @@ const NavigationTabsComponent = (props) => {
return (
<div className={`navbar-logged ${orientation === 'vertical' ? 'navbar-vertical' : ''}`}>
{makeNotifications()}
<ul className="navbar-main">
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Entirely linting changes


interface DatasetSearchFooterProps {
selectedDatasets: number[];
datasets: Dataset[];
datasets: DatasetTerm[];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the elasticsearch terms, this is the right typing (I believe)

@@ -31,6 +31,21 @@ const styles = {
},
};

export const applyForAccess = async (selected, history) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got pulled out to be reused elsewhere. I could see this going to a libs or utils file as well - what do you all think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In another defunct DAA-related PR, I had pulled this out to a separate component, so I think it makes sense.

Copy link
Contributor

@rushtong rushtong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great, thank you! No code suggestions. The linting changes look good, nice catch. There are a couple other study properties we could be showing but would likely require a decision from product on whether we should be showing them here. We could look into adding the following fields. Some are currently indexed, but some may not be and we should look at adding those values to the index:

  • study type
  • data types
  • data submitter and/or email
  • phs id, and any other NIH related info we capture

Copy link
Contributor

@rjohanek rjohanek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this maintain selections/search upon navigation back to the data library? I thought we decided on a side bar to avoid extra navigation?

Copy link
Contributor

@rjohanek rjohanek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add cypress component tests for this new component in ts?

@s-rubenstein
Copy link
Contributor Author

@rjohanek it does not maintain search or filters - this was on request from @lstrano-broad when we met with him - he prefers the extra page.

@s-rubenstein
Copy link
Contributor Author

I can add tests

@rushtong
Copy link
Contributor

rushtong commented Dec 4, 2024

@rjohanek it does not maintain search or filters - this was on request from @lstrano-broad when we met with him - he prefers the extra page.

I think maintaining filter state would be a great feature, but we need to design that and it would be a completely new feature.

@lstrano-broad
Copy link

I never requested the filters to reset. I agree the filter state needs to maintained when user click back.

Copy link
Contributor

@rjohanek rjohanek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tests look good thanks!!

@s-rubenstein
Copy link
Contributor Author

@lstrano-broad we'll need to do that as a separate ticket - right now we don't have a mechanism to store filter state between pages, so when you go back to the original URL it has the same filters

@s-rubenstein
Copy link
Contributor Author

(Separate page was Lou's request, to be clear - not the loss of filters. The loss of filters is a side effect that we can fix separately)

@s-rubenstein s-rubenstein merged commit dad1fbc into develop Dec 5, 2024
9 checks passed
@s-rubenstein s-rubenstein deleted the sr/dt-1069-study-sidebar branch December 5, 2024 20:29
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.

4 participants