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.

Sign up for GitHub

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

Jump to bottom

Feat/vadc sprint18 #1597

Merged
merged 4 commits into from
Sep 20, 2024
Merged

Feat/vadc sprint18 #1597

merged 4 commits into from
Sep 20, 2024

Conversation

jarvisraymond-uchicago
Copy link
Contributor

Link to JIRA ticket if there is one:

Bug Fixes

  • Prevents a user from submitting duplicate covariates for both continuous and dichotomous outcome types in the VADC Gen3 GWAS app

Improvements

  • Fixes spelling mistakes in code base (continuous vs continous)
  • Globalizes data viz components (histogram and Simple3Sets ) for use between VADC apps
  • In the case where the histogram bin data is missing (undefined) for the histogram, application now shows an error message. Before it would only show the error message when the value was null, and not when it is undefined (i.e. it doesn't exist at all in the sent data).

@jarvisraymond-uchicago
Feat/globalize vadc charts (#1594)
6e830c9 
* feat(globalizeVADCCharts): initial commit

* feat(globalizeVADCCharts): reverted unintentionally changed files

* feat(globalizeVADCCharts): Fixed missing prop and import name for unit tests

* feat(globalVADCCharts): Updates ref from Data-Viz to DataViz to remain consistent with naming elsewhere in app

* feat(globalVADCCharts): simplified logic for missing bin data

* feat(globalizeVADCCharts): Fixed error msg logic for undefined bins

* feat(globalizeVADCCharts): resolved ESLINT issue
@jarvisraymond-uchicago
Bugfix/duplicate dichotomous covariates (#1596)
2ad8fc0 
* bugfix(discoveryModalButtonsMediaQueries): Initial commit (#1593)

* bugfix(discoveryModalButtonsMediaQueries): Initial commit

* bugfix(discoveryModalButtonsMediaQueries): Reverted unintentionally changed file and removed commented code

* bugfix(duplicateDichotomousCovariates): initial commit

* bugfix(duplicateDichotomousCovariates): removed excess line breaks

* bugfix(duplicateDichotomousCovariates): Added logic to prevent display of selected covariates

* bugfix(duplicateDichotomousCovariates): ran linter

* bugfix(duplicateDichotomousCovariates): refactored var names for clarity

* bugfix(duplicateDichotomousCovariates): formatted test for clarity

* bugfix(duplicateDichotomousCovariates): added inadvertantly changed file

* bugfix(duplicateDichotomousCovariates): Formatted test code for readability

* bugfix(duplicateDichotomousCovariates): fixed spelling error on continuous
@jarvisraymond-uchicago
Merge branch 'master' into feat/vadc_sprint18
7ee3b86
@jarvisraymond-uchicago jarvisraymond-uchicago marked this pull request as ready for review September 18, 2024 19:10
@github-actions GitHub Actions
Copy link

Please find the detailed integration test report here

Please find the ci env pod logs here

@github-actions GitHub Actions
Copy link

filepath $$\textcolor{#23d18b}{\tt{passed}}$$ $$\textcolor{#f14c4c}{\tt{error}}$$ $$\textcolor{#ffa500}{\tt{skipped}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_ras\_authn.py}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$
$$\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\_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\_login\_page.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{2}}$$
$$\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\_discoverypage.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{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{16}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$ $$\textcolor{#ffa500}{\tt{4}}$$ $$\textcolor{#f14c4c}{\tt{23}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

tianj7
tianj7 approved these changes Sep 19, 2024
View reviewed changes
Copy link
Contributor

@tianj7 tianj7 left a comment

Choose a reason for hiding this comment

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

lgtm

@github-actions GitHub Actions
Copy link

filepath $$\textcolor{#f14c4c}{\tt{error}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_ras\_authn.py}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@github-actions GitHub Actions
Copy link

filepath $$\textcolor{#666666}{\tt{SUBTOTAL}}$$
$$\textcolor{#23d18b}{\tt{TOTAL}}$$ $$\textcolor{#666666}{\tt{0}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@github-actions GitHub Actions
Copy link

filepath $$\textcolor{#23d18b}{\tt{passed}}$$ $$\textcolor{#f14c4c}{\tt{failed}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_ras\_authn.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{3}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@krishnaa05 krishnaa05 closed this Sep 20, 2024
@krishnaa05 krishnaa05 reopened this Sep 20, 2024
@github-actions GitHub Actions
Copy link

filepath $$\textcolor{#f14c4c}{\tt{failed}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_homepage.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 GitHub Actions
Copy link

filepath $$\textcolor{#23d18b}{\tt{passed}}$$ SUBTOTAL
$$\textcolor{#23d18b}{\tt{tests/test\_homepage.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@jarvisraymond-uchicago jarvisraymond-uchicago merged commit 0ef57ff into master Sep 20, 2024
14 of 15 checks passed
@jarvisraymond-uchicago jarvisraymond-uchicago deleted the feat/vadc_sprint18 branch September 20, 2024 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tianj7 tianj7 tianj7 approved these changes

Assignees
No one assigned
Labels
TestHomePage
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jarvisraymond-uchicago @tianj7 @haraprasadj @krishnaa05