Feat/gwas unified flow style steps2 and3 #1203
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ook nicer for steps 2.1 and 3.1
pieterlukasse
approved these changes
Jan 19, 2023
jarvisraymond-uchicago
deleted the
feat/gwasUnifiedFlowStyleSteps2And3
branch
Merged
jarvisraymond-uchicago
added a commit
that referenced
this pull request
Jan 25, 2023
* Feat/gwas unified flow style sidebars (#1195) * feat(gwasUnifiedFlowStyleSidebars): Initial commit * feat(gwasUnifiedFlowStyleSidebars): ran eslint new * feat(gwasUnifiedFlowStyleSidebars): ran stylelint, removed unneeded CSS rules, removed unneeded prop * feat(gwasUnifiedFlowStyleSidebars): added rule back so buttons align * feat(gwasUnifiedFlowStyleSidebars): made covariates prop for SelectOutcome not required * feat(gwasUnifiedFlowStyleSidebars): ran eslint new * feat(gwasUnifiedFlowStyleSidebars): changed prop type for covariates to array * feat: add extra documentation on how to run JEST tests * feat: add JEST tests for SelectHareDropDown includes: - working JEST test with mocks - fix to use correct cohortMiddlewareApi.js and to stop initializing WTS since this is not necessary anymore and is done globally. This was removed here so there would be less things to mock/worry about as well * feat: add JEST tests for dichotomous(case/control) scenario * Feat/gwas unified flow outcome card (#1201) * feat(gwasUnifiedFlowOutcomeCard): initial commit * feat(gwasUnifiedFlowOutcomeCard): Added unit test for CovariatesCard.js * feat(gwasUnifiedFlowOutcomeCard): Updated test to use ValidInitialState data for outcome and updated CovariatesCardList keys to use covariate obj * feat(gwasUnifiedFlowOutcomeCard): Cleaned up code formatting for CovariatesCardList.test.jsx * feat(gwasUnifiedFlowStyleSidebars): Wrote storybook for CovariatesCardsList * feat(gwasUnifiedFlowStyleSidebars): Changed outcome card title to Outcome Phenotype to match design * feat(gwasUnifiedFlowOutcomeCard): Changed all instances of InitialValidState to ValidState * feat(gwasUnifiedFlowOutcomeCard): Updated CovariatesCardList test to use Valid state objs instead of hard coded values; updated ref to Valid state in JobInputModal; Updated ValidState to use correct data * feat(gwasUnifiedFlowOutcomeCard): Ran ESLINT-new * Feat/gwas unified flow style steps2 and3 (#1203) * feat(gwasUnifiedFlowOutcomeCard): Styled view 2.1 * feat(gwasUnifiedFlowOutcomeCard): Styled view 3.1 * feat(gwasUnifiedFlowStyleSteps2And3): Added styling to make loading look nicer for steps 2.1 and 3.1 * feat(gwasUnifiedFlowStyleSteps2And3): started styling for step 2.2 and 3.2 * feat(gwasUnifiedFlowStyleSteps2And3): Ran eslint-new * feat(gwasUnifiedFlowStyleSteps2And3): Added styles for step 3.2 * feat(gwasUnifiedFlowStyleSteps2And3): Ran eslint-new * feat(gwasUnifiedFlowStyleSteps2And3): Made loading widths consistent * feat(gwasUnifiedFlowStyleSteps2And3): Ran ESLINT new * feat(gwasUnifiedFlowStyleSteps2And3): Removed unneeded CSS rule * feat(gwasUnifiedFlowStyleSteps2And3): Removed another unneeded CSS rule * feat(gwasUnifiedFlowStyleSteps2And3): Ran Stylelint * feat(gwasUnifiedFlowStyleSteps2And3): Formatted CSS * feat(gwasUnifiedFlowStyleSteps2And3): Formatted CSS and removed CSS comment * feat(gwasUnifiedFlowStyleSteps2And3): Removed deprecated styles * VADC-393: fix query config import (#1202) * fix(cohort): query config import * fix(cohort): fix error in import of useQuery Co-authored-by: pieterlukasse <pieterlukasse@gmail.com> * VADC-378 Integrate the virtual tour into the new GWAS (#1207) * feat(gwasUnifiedFlowReacTour): Initial ReacTour addition. * feat(gwasUnifiedFlowReacTour): Initial working version of ReacTour for unified flow * feat(gwasUnifiedFlowReacTour): Moved logic to ProgressBar and TourButton * feat(gwasUnifiedFlowReacTour): Added steps to the first screen * feat(gwasUnifiedFlowReacTour): Added Reactour to the first screen and started second screen * feat(gwasUnifiedFlowReacTour): Added ReacTour to step 2 * feat(gwasUnifiedFlowOutcomeCard): Styled view 2.1 * feat(gwasUnifiedFlowReacTour): Added ReacTour to step 3 * feat(gwasUnifiedFlowOutcomeCard): Styled view 3.1 * feat(gwasUnifiedFlowStyleSteps2And3): Added styling to make loading look nicer for steps 2.1 and 3.1 * feat(gwasUnifiedFlowStyleSteps2And3): started styling for step 2.2 and 3.2 * feat(gwasUnifiedFlowStyleSteps2And3): Ran eslint-new * feat(gwasUnifiedFlowStyleSteps2And3): Added styles for step 3.2 * feat(gwasUnifiedFlowStyleSteps2And3): Ran eslint-new * feat(gwasUnifiedFlowReacTour): Added ReacTour to the fourth screen * feat(gwasUnifiedFlowStyleSteps2And3): Made loading widths consistent * feat(gwasUnifiedFlowStyleSteps2And3): Ran ESLINT new * feat(gwasUnifiedFlowStyleSteps2And3): Removed unneeded CSS rule * feat(gwasUnifiedFlowStyleSteps2And3): Removed another unneeded CSS rule * feat(gwasUnifiedFlowReacTour): Added logic to show ReacTour on subscreens 2 and 3 * feat(gwasUnifiedFlowReacTour): eslint formatting * feat(gwasUnifiedFlowStyleSteps2And3): Ran Stylelint * feat(gwasUnifiedFlowStyleSteps2And3): Formatted CSS * feat(gwasUnifiedFlowStyleSteps2And3): Formatted CSS and removed CSS comment * feat(gwasUnifiedFlowStyleSteps2And3): Removed deprecated styles * feat(gwasUnifiedFlowReacTour): Added ReacTour for step 3 subscreens * feat(gwasUnifiedFlowReacTour): Added explanation for the modal window on the fourth step * feat(gwasUnifiedFlowReacTour): Wording * feat(gwasUnifiedFlowReacTour): Updated logic for selectionMode reset and changed wording * feat(gwasUnifiedFlowReacTour): Resolving conflicts with parent branch * feat(gwasUnifiedFlowReacTour): Fixed ReacTour selectors for the histogram * feat(gwasUnifiedFlowReacTour): Removed unsuded ReacTour selectors and changed wording * feat(gwasUnifiedFlowReacTour): eslint formatting * feat(gwasUnifiedFlowReacTour): Clean up * feat(gwasUnifiedFlowReacTour): Wording * feat(gwasUnifiedFlowReacTour): Wording Co-authored-by: Jarvis Raymond <jarvisraymond@uchicago.edu> Co-authored-by: Jarvis <113449836+jarvisraymond-uchicago@users.noreply.github.com> * feat(vadc_sprint01): Skipped ProgressBar.test.jsx due to CI test for NPM test failing to correctly use aliased import of @Reactour/tour * feat(vadc_sprint01): Pulled remote local * feat(vadc_sprint01): Removed dependencies for Progress Bar test that were causing problems Co-authored-by: pieterlukasse <pieterlukasse@gmail.com> Co-authored-by: Kyle Hernandez <kmhernan84@gmail.com> Co-authored-by: vzpgb <45467497+vzpgb@users.noreply.github.com>
This was referenced Oct 1, 2023
This was referenced Oct 2, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Jira Ticket: VADC-373
New Features
This update the styles for views 2.1, 2.2, 3.1 and 3.2, so that the buttons are to be positioned on the top right above the charts. To implement the design, additional
divelements and class names were added. Additionally the heights of the charts were altered to fit within their containers. This also removes unneeded styles from SelectCovariates.css.Design
Implementation