Skip to content

Feature/data library#1686

Open
k-burt-uch wants to merge 10 commits intomasterfrom
feature/data_library
Open

Feature/data library#1686
k-burt-uch wants to merge 10 commits intomasterfrom
feature/data_library

Conversation

@k-burt-uch
Copy link
Copy Markdown
Contributor

Link to JIRA ticket if there is one:

New Features

  • Adds data library list creation and management to Discovery

Breaking Changes

Bug Fixes

Improvements

Dependency updates

Deployment changes

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 2, 2025

filepath $$\textcolor{#23d18b}{\tt{passed}}$$ $$\textcolor{#f14c4c}{\tt{failed}}$$ $$\textcolor{#ffa500}{\tt{skipped}}$$ SUBTOTAL
$$\textcolor{#23d18b}{\tt{tests/test\_requestor.py}}$$ $$\textcolor{#23d18b}{\tt{5}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{5}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_ras\_authn.py}}$$ $$\textcolor{#23d18b}{\tt{3}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{3}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_login\_page.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_data\_upload.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_indexing\_page.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_audit\_service.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_homepage.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_pfb\_export.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_graph\_submit\_and\_query.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_gen3ff\_landing\_page.py}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#ffa500}{\tt{2}}$$ $$\textcolor{#ffa500}{\tt{2}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_register\_user.py}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#ffa500}{\tt{2}}$$ $$\textcolor{#ffa500}{\tt{2}}$$
$$\textcolor{#f14c4c}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{18}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#ffa500}{\tt{4}}$$ $$\textcolor{#f14c4c}{\tt{23}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 2, 2025

filepath $$\textcolor{#f14c4c}{\tt{failed}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 3, 2025

filepath $$\textcolor{#f14c4c}{\tt{failed}}$$ $$\textcolor{#f14c4c}{\tt{error}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{2}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{2}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@github-actions
Copy link
Copy Markdown

Please find the ci env pod logs here


.discovery-action-section {
display: flex;
flex-direction: row;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

do we need this? there is only one element in that div

if (currentList) {
saveToList(currentList.label, currentList.value);
} else {
saveToList(currentList.label);
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

currentList might be null or undefined here?

Comment thread src/Discovery/reduxer.js
const mapStateToProps = (state) => ({
user: state.user,
discovery: state.discovery,
systemPopupActivated: !!state.popups?.systemUseWarnPopup,
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

why we need this props for data library?

disabled={error !== null || loading || data?.length === 0 || currentList === undefined || selectedResources.length === 0 || notLoggedIn}
onClick={() => {
if (currentList) {
saveToList(currentList.label, currentList.value);
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

should we call fetchLists() after this? Otherwise if I'm creating a new list, the list ID will remains undefined until I refresh the page 🤔

@@ -0,0 +1,183 @@
import React, {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

wish we could have a story for this component in storybook

Comment thread src/index.ejs
- https://*.quicksight.aws.amazon.com for loading AWS Quicksight dashboards into COVID-19 Home page
-->
<meta http-equiv="Content-Security-Policy" content="default-src 'self' https://login.bionimbus.org https://wayf.incommonfederation.org; child-src blob:; img-src 'self' <%= htmlWebpackPlugin.options.imgSrc %> https://opendata.datacommons.io https://static.planx-pla.net data: https://*.s3.amazonaws.com blob:; script-src 'self' 'unsafe-eval' <%= htmlWebpackPlugin.options.scriptSrc %>; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; object-src 'none'; font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com; connect-src 'self' https://login.bionimbus.org https://wayf.incommonfederation.org https://opendata.datacommons.io https://static.planx-pla.net https://*.zendesk.com <%= htmlWebpackPlugin.options.connectSrc %>; frame-src <%= htmlWebpackPlugin.options.connectSrc %> 'self' https://auspice.planx-pla.net https://auspice.pandemicresponsecommons.org https://*.quicksight.aws.amazon.com;">
<meta http-equiv="Content-Security-Policy" content="default-src 'self' http://localhost:8000 https://login.bionimbus.org https://wayf.incommonfederation.org; child-src blob:; img-src 'self' <%= htmlWebpackPlugin.options.imgSrc %> http://localhost:8000 https://opendata.datacommons.io https://static.planx-pla.net data: https://*.s3.amazonaws.com blob:; script-src 'self' 'unsafe-eval' <%= htmlWebpackPlugin.options.scriptSrc %>; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; object-src 'none'; font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com; connect-src 'self' https://login.bionimbus.org https://wayf.incommonfederation.org https://opendata.datacommons.io https://static.planx-pla.net https://*.zendesk.com <%= htmlWebpackPlugin.options.connectSrc %>; frame-src <%= htmlWebpackPlugin.options.connectSrc %> 'self' https://auspice.planx-pla.net https://auspice.pandemicresponsecommons.org https://*.quicksight.aws.amazon.com;">
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

is this for local testing? if so I suggest moving them to dev.html and only use them from there

Comment thread webpack.config.js
scriptSrcURLs.push(...['https://www.google-analytics.com', 'https://ssl.google-analytics.com', 'https://www.googletagmanager.com']);
connectSrcURLs.push(...['https://www.google-analytics.com', 'https://*.analytics.google.com', 'https://analytics.google.com', 'https://*.g.doubleclick.net']);
scriptSrcURLs.push(...['http://localhost:8000', 'http://www.google-analytics.com','https://www.google-analytics.com', 'https://ssl.google-analytics.com', 'https://www.googletagmanager.com']);
connectSrcURLs.push(...['http://localhost:8000', 'https://*.analytics.google.com', 'https://analytics.google.com', 'https://*.g.doubleclick.net']);
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I don't think you need to do them here with google analytics

<Button
loading={loading}
type='primary'
disabled={error !== null || loading || data?.length === 0 || currentList === undefined || selectedResources.length === 0 || notLoggedIn}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

data?.length === 0 seems to prevent any initial list creation. It does not seem to increase when a user's first list is initially entered (after creation, but before a study is Saved to list), and subsequently can't be Saved to List as the button remains disabled. I have tested removing this and it resolves this issue

@github-actions
Copy link
Copy Markdown

filepath $$\textcolor{#f14c4c}{\tt{failed}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$

Please find the detailed integration test report here

Login here

Please find the ci env pod logs here

@github-actions
Copy link
Copy Markdown

filepath skipped SUBTOTAL
tests/test_discoverypage.py 1 1
TOTAL 1 1

Please find the detailed integration test report here

Login here

Please find the ci env pod logs here

@github-actions
Copy link
Copy Markdown

filepath failed SUBTOTAL
tests/test_discoverypage.py 1 1
TOTAL 1 1

Please find the detailed integration test report here (login here first)

@github-actions
Copy link
Copy Markdown

filepath passed failed skipped SUBTOTAL
tests/test_gen3ff_landing_page.py 0 0 2 2
tests/test_ras_authn.py 0 0 3 3
tests/test_requestor.py 5 0 0 5
tests/test_audit_service.py 1 0 0 1
tests/test_homepage.py 1 0 0 1
tests/test_register_user.py 2 0 0 2
tests/test_data_upload.py 2 0 0 2
tests/test_graph_submit_and_query.py 1 0 0 1
tests/test_login_page.py 2 0 0 2
tests/test_pfb_export.py 1 0 0 1
tests/test_discoverypage.py 0 1 0 1
TOTAL 15 1 5 21

Please find the detailed integration test report here (login here first)

@k-burt-uch k-burt-uch force-pushed the feature/data_library branch from a81f1d8 to e7192e9 Compare August 19, 2025 21:44
@github-actions
Copy link
Copy Markdown

filepath passed failed skipped SUBTOTAL
tests/test_gen3ff_landing_page.py 0 0 2 2
tests/test_register_user.py 0 0 2 2
tests/test_ras_authn.py 0 0 3 3
tests/test_requestor.py 5 0 0 5
tests/test_audit_service.py 1 0 0 1
tests/test_data_upload.py 1 1 0 2
tests/test_login_page.py 2 0 0 2
tests/test_graph_submit_and_query.py 1 0 0 1
tests/test_homepage.py 1 0 0 1
tests/test_pfb_export.py 1 0 0 1
tests/test_discoverypage.py 0 1 0 1
TOTAL 12 2 7 21

Please find the detailed integration test report here (login here first)

@k-burt-uch k-burt-uch force-pushed the feature/data_library branch from e7192e9 to bd45089 Compare October 1, 2025 16:06
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Oct 1, 2025

filepath passed failed skipped SUBTOTAL
tests/test_gen3ff_landing_page.py 0 0 2 2
tests/test_register_user.py 0 0 2 2
tests/test_ras_authn.py 0 0 3 3
tests/test_requestor.py 5 0 0 5
tests/test_audit_service.py 1 0 0 1
tests/test_data_upload.py 2 0 0 2
tests/test_login_page.py 2 0 0 2
tests/test_graph_submit_and_query.py 1 0 0 1
tests/test_pfb_export.py 1 0 0 1
tests/test_homepage.py 1 0 0 1
tests/test_discoverypage.py 0 1 0 1
TOTAL 13 1 7 21

Please find the detailed integration test report here

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 5, 2025

filepath passed failed skipped SUBTOTAL
tests/test_requestor.py 5 0 0 5
tests/test_user_token.py 3 0 0 3
tests/test_audit_service.py 1 0 0 1
tests/test_data_upload.py 2 0 0 2
tests/test_login_page.py 2 0 0 2
tests/test_graph_submit_and_query.py 1 0 0 1
tests/test_homepage.py 1 0 0 1
tests/test_workspace.py 1 0 0 1
tests/test_pfb_export.py 1 0 0 1
tests/test_ras_authn.py 0 0 3 3
tests/test_gen3ff_landing_page.py 0 0 2 2
tests/test_register_user.py 0 0 2 2
tests/test_dbgap.py 0 1 0 1
tests/test_discoverypage.py 0 1 0 1
TOTAL 17 2 7 26

Please find the detailed integration test report here

Please find the Github Action logs here

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