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

Updated HRA EUI and organ-info web components to latest version #3577

Merged
merged 4 commits into from
Oct 22, 2024

Conversation

bherr2
Copy link
Member

@bherr2 bherr2 commented Oct 22, 2024

Updated both the EUI and organ-info web components. I'm not able to test this locally. It should work fine, but please give it a local test.

Copy link
Collaborator

@john-conroy john-conroy left a comment

Choose a reason for hiding this comment

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

Thanks! I'll test this out locally this afternoon.

@@ -19,8 +19,7 @@ function Switch({ organs_count }) {
return (
<ccf-organ-info
organ-iri={iri}
use-remote-api="true"
remote-api-endpoint="https://apps.humanatlas.io/hubmap-hra-api/v1"
data-sources='["https://apps.humanatlas.io/api/ds-graph/hubmap?token="]'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
data-sources='["https://apps.humanatlas.io/api/ds-graph/hubmap?token="]'
data-sources='["https://apps.humanatlas.io/api/ds-graph/hubmap"]'

Do we need the empty token param?

Copy link
Member Author

Choose a reason for hiding this comment

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

It is preferable to keep the ?token= for caching purposes as the EUI uses the same data sources string and will be cached across both products.

Copy link
Collaborator

@NickAkhmetov NickAkhmetov left a comment

Choose a reason for hiding this comment

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

@bherr2 could you make the corresponding updates to the organ-info script/styles links here? https://github.com/hubmapconsortium/portal-ui/blob/update-hra/context/app/static/js/components/HRA/CCFOrganInfo.tsx#L29-L30

<title>HuBMAP HRA Exploration User Interface</title>
<base href="https://cdn.humanatlas.io/ui/ccf-eui/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/png" href="/favicon.png" />
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
<link rel="icon" type="image/png" href="/favicon.png" />
<link rel="icon" type="image/x-icon" href="/favicon.ico" />

We have a .ico icon, not a .png icon: https://github.com/hubmapconsortium/portal-ui/blob/main/context/app/static/favicon.ico

Copy link
Member Author

Choose a reason for hiding this comment

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

This actually refers to the favicon at https://cdn.humanatlas.io/ui/ccf-eui/ as it is using https://cdn.humanatlas.io/ui/ccf-eui/ as the base-href (see line 7)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah, right, good call - I missed that detail.

I think it'll be all set to merge if the CCFOrganInfo component is up to date.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, sounds good. Like I said with the organ info, I'd like to keep the ?token= as is since it will help tremendously with caching/responsiveness.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh! Thank you, yes, I'll get those updated.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, pushed it!

@NickAkhmetov NickAkhmetov merged commit bb07051 into main Oct 22, 2024
8 checks passed
@NickAkhmetov NickAkhmetov deleted the update-hra branch October 22, 2024 19:15
@bherr2
Copy link
Member Author

bherr2 commented Oct 22, 2024

Thank you!

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.

3 participants