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

Feat/vadc sprint21 #1131

Merged
merged 9 commits into from
Nov 2, 2022
Merged

Feat/vadc sprint21 #1131

merged 9 commits into from
Nov 2, 2022

Conversation

jarvisraymond-uchicago
Copy link
Contributor

@jarvisraymond-uchicago jarvisraymond-uchicago commented Nov 1, 2022

Jira Ticket: VADC-216
Jira Ticket: VADC-267
Jira Ticket: VADC-243
Jira Ticket: VADC-83

New Features

This implements the features associated with tickets for VADC Sprint 21 Frontend Work:

  • gwas V2 workflow progress bar
  • Add new command that only runs eslint on edited files in current git branch
  • Add Attrition Table below Steps (basic setup & styling only)
  • UI feature - Euler diagram for evaluating cohort selections in dichotomous covariate or dichotomous outcome steps

Dependency updates

  • Added "@upsetjs/venn.js": "^1.4.2"
  • Requires dependencies overrides:
    "uglify-js": "3.14.3",
    "ansi-regex": "3.0.1"

* feat(CombineGWASWorkflowProgressBar): Initial commit

* feat(CombineGWASWorkflowProgressBar): created partially working prototype

* feat(CombineGWASWorkflowProgressBar): added logic for displaying select or edit for each step

* feat(CombineGWASWorkflowProgressBar): created CSS style sheet for new component and began overriding AntD styles to match design

* feat(CombineGWASWorkflowProgressBar): fixed colors to match design for numeric icons

* feat(CombineGWASWorkflowProgressBar): set width to container to 100%

* feat(CombineGWASWorkflowProgressBar): added animation

* feat(CombineGWASWorkflowProgressBar): added styles for Get Started button

* feat(CombineGWASWorkflowProgressBar): positioned get started button

* feat(CombineGWASWorkflowProgressBar): removed inline styles from ProgressBar.jsx

* feat(CombineGWASWorkflowProgressBar): formatted GWASContainer.jsx

* feat(CombineGWASWorkflowProgressBar): changed class name to progress-bar

* feat(CombineGWASWorkflowProgressBar): began authoring JEST test

* feat(CombineGWASWorkflowProgressBar): Added clarifying comment to jest test

* feat(CombineGWASWorkflowProgressBar): Formatted test code

* feat(CombineGWASWorkflowProgressBar): Added Story Book for ProgressBar

* feat(CombineGWASWorkflowProgressBar): ran eslint on ProgressBar.test.jsx

* feat(CombineGWASWorkflowProgressBar): ran autoformatters eslint and stylelint

* feat(CombineGWASWorkflowProgressBar): Resolved style lint error in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): Resolved remaining style lint errors in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Dockerfile

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Submission/MapDataModel.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file again  UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT fix

* feat(CombineGWASWorkflowProgressBar): Refactored code to use a constants file to make code more DRY

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Added media query so that button will not overlap progress bar on smaller screens

* feat(CombineGWASWorkflowProgressBar): Formatted CSS with line break

* feat(CombineGWASWorkflowProgressBar): Updated JEST test to use for loops

* feat(CombineGWASWorkflowProgressBar): Updated GWASContainer.jsx to use nextButtonEnabled boolean for disabling or enabling next button

* feat(CombineGWASWorkflowProgressBar): Ran eslint on  GWASContainer.jsx
* feat(eslintOnlyOnCurrentBranch): Added new command eslint-new

* feat(eslintOnlyOnCurrentBranch): Removed ignore pattern for json

* feat(eslintOnlyOnCurrentBranch): Reverted files changed in feat/vadc_sprint21

* feat(eslintOnlyOnCurrentBranch): Reverted additional files changed in feat/vadc_sprint21

* feat(eslintOnlyOnCurrentBranch): Updated r
eadme.md with info on linting

* feat(eslintOnlyOnCurrentBranch): Spell checked and edited new addition to README.md

* feat(eslintOnlyOnCurrentBranch): Updated to reference master instead of HEAD

* feat(eslintOnlyOnCurrentBranch): Updated command to only parse JS JSX and TSX files and quiet warnings

* feat(eslintOnlyOnCurrentBranch): Updated command to use ext from original command, but added additional ignore patterns

* feat(eslintOnlyOnCurrentBranch): Updated command to ignore yml files
* Feat/combine gwas workflow progress bar (#1125)

* Update node js and fix failing unit tests (#1119)

* fixed unhandled promise rejection

...which fixes locally failing jest test

* fix failing unit test for UserProfile

* udpate node js and npm for CI tests

* make test a bit more specific

* set node js to 16.x

* update node js to 16.x and npm to 8.15 in Dockerfile

* revert npm version change

* feat(CombineGWASWorkflowProgressBar): Initial commit

* feat(CombineGWASWorkflowProgressBar): created partially working prototype

* feat(CombineGWASWorkflowProgressBar): added logic for displaying select or edit for each step

* feat(CombineGWASWorkflowProgressBar): created CSS style sheet for new component and began overriding AntD styles to match design

* feat(CombineGWASWorkflowProgressBar): fixed colors to match design for numeric icons

* feat(CombineGWASWorkflowProgressBar): set width to container to 100%

* feat(CombineGWASWorkflowProgressBar): added animation

* feat(CombineGWASWorkflowProgressBar): added styles for Get Started button

* feat(CombineGWASWorkflowProgressBar): positioned get started button

* feat(CombineGWASWorkflowProgressBar): removed inline styles from ProgressBar.jsx

* feat(CombineGWASWorkflowProgressBar): formatted GWASContainer.jsx

* feat(CombineGWASWorkflowProgressBar): changed class name to progress-bar

* feat(CombineGWASWorkflowProgressBar): began authoring JEST test

* feat(CombineGWASWorkflowProgressBar): Added clarifying comment to jest test

* feat(CombineGWASWorkflowProgressBar): Formatted test code

* feat(CombineGWASWorkflowProgressBar): Added Story Book for ProgressBar

* feat(CombineGWASWorkflowProgressBar): ran eslint on ProgressBar.test.jsx

* feat(CombineGWASWorkflowProgressBar): ran autoformatters eslint and stylelint

* feat(CombineGWASWorkflowProgressBar): Resolved style lint error in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): Resolved remaining style lint errors in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Dockerfile

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Submission/MapDataModel.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file again  UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT fix

* feat(CombineGWASWorkflowProgressBar): Refactored code to use a constants file to make code more DRY

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Added media query so that button will not overlap progress bar on smaller screens

* feat(CombineGWASWorkflowProgressBar): Formatted CSS with line break

* feat(CombineGWASWorkflowProgressBar): Updated JEST test to use for loops

* feat(CombineGWASWorkflowProgressBar): Updated GWASContainer.jsx to use nextButtonEnabled boolean for disabling or enabling next button

* feat(CombineGWASWorkflowProgressBar): Ran eslint on  GWASContainer.jsx

Co-authored-by: pieterlukasse <pieterlukasse@gmail.com>

* feat(CombineGWASWorkflowAttritionTable): Initial Commit, not working yet

* feat(CombineGWASWorkflowAttritionTable): Added eslint-new command to this branch

* feat(CombineGWASWorkflowProgressBar): Updated file references in AttritionTable imports

* feat(CombineGWASWorkflowProgressBar): Created partially working prototype (shows some data, no headers, has js errors)

* feat(CombineGWASWorkflowAttritionTable): Added table header obj to constants.js

* feat(CombineGWASWorkflowAttritionTable): Added table headerDataSource obj to constants and ran eslint-new

* feat(CombineGWASWorkflowAttritionTable): updated tableHeader in GWASContainer.jsx

* feat(CombineGWASWorkflowAttritionTable): began styling table

* feat(CombineGWASWorkflowAttritionTable): made alternating table rows different colors

* feat(CombineGWASWorkflowAttritionTable): added table borders

* feat(CombineGWASWorkflowAttritionTable): ran stylelint

* feat(CombineGWASWorkflowAttritionTable): created ChartIcons directory and refactored to use more semantic HTML

* feat(CombineGWASWorkflowAttritionTable): added SVG icons

* feat(CombineGWASWorkflowAttritionTable): Updated dropdown icon styling

* feat(CombineGWASWorkflowAttritionTable): Removed unneeded files and updated padding on table

* feat(CombineGWASWorkflowAttritionTable): Reset files unrelated to this ticket

* feat(CombineGWASWorkflowAttritionTable): Updated dropdown button styles

* feat(CombineGWASWorkflowAttritionTable): Updated attrition table logic, styles and storybook to not use antD list component, to avoid injection of non-tabular elements in table element

* feat(CombineGWASWorkflowAttritionTable): Converted inline styles to class names

* feat(CombineGWASWorkflowAttritionTable): Updated padding left class to 26px

* feat(CombineGWASWorkflowAttritionTable): Ran eslint-new on branch and fixed errors

* feat(CombineGWASWorkflowAttritionTable): Ran stylelint on branch and fixed errors

* feat(CombineGWASWorkflowAttritionTable): Reverted unintentionally changed ProgressBar.test.jsx file

* feat(CombineGWASWorkflowsAttritionTable): Made SVG more accessible

* feat(CombineGWASWorkflowAttritionTable): Changed title elements to desc to avoid hover effect in browser - additional accessible text will be added once chart fires modal

* feat(CombineGWASWorkflowAttritionTable): Removed inline comments in AttritionTableRow.jsx, they've been logged in a ticket instead

* feat(CombineGWASWorkflowAttritionTable): Clarified comment in AttritionTableRow.jsx

* feat(CombineGWASWorkflowAttritionTable): Made CSS consistent for colors in AttritionTable.css

* feat(CombineGWASWorkflowAttritionTable): Created new CSS rule to make stylesheet more DRY

* feat(CombineGWASWorkflowsAttritionTable): Cleaned up JS formating in AttritionTable.jsx

Co-authored-by: pieterlukasse <pieterlukasse@gmail.com>
 - uses venn.js and queries cohorts and cohort overlap endpoint
@jarvisraymond-uchicago jarvisraymond-uchicago marked this pull request as ready for review November 1, 2022 14:44
@mfshao
Copy link
Collaborator

mfshao commented Nov 1, 2022

can you fillout the PR description properly? Otherwise gen3git will only generate a release note containing a list of ticket numbers

@jarvisraymond-uchicago
Copy link
Contributor Author

jarvisraymond-uchicago commented Nov 1, 2022

can you fillout the PR description properly? Otherwise gen3git will only generate a release note containing a list of ticket numbers

PR description updated with description of updates and dependencies.

cmlsn pushed a commit that referenced this pull request Nov 29, 2022
* Feat/combine gwas workflow progress bar (#1125)

* feat(CombineGWASWorkflowProgressBar): Initial commit

* feat(CombineGWASWorkflowProgressBar): created partially working prototype

* feat(CombineGWASWorkflowProgressBar): added logic for displaying select or edit for each step

* feat(CombineGWASWorkflowProgressBar): created CSS style sheet for new component and began overriding AntD styles to match design

* feat(CombineGWASWorkflowProgressBar): fixed colors to match design for numeric icons

* feat(CombineGWASWorkflowProgressBar): set width to container to 100%

* feat(CombineGWASWorkflowProgressBar): added animation

* feat(CombineGWASWorkflowProgressBar): added styles for Get Started button

* feat(CombineGWASWorkflowProgressBar): positioned get started button

* feat(CombineGWASWorkflowProgressBar): removed inline styles from ProgressBar.jsx

* feat(CombineGWASWorkflowProgressBar): formatted GWASContainer.jsx

* feat(CombineGWASWorkflowProgressBar): changed class name to progress-bar

* feat(CombineGWASWorkflowProgressBar): began authoring JEST test

* feat(CombineGWASWorkflowProgressBar): Added clarifying comment to jest test

* feat(CombineGWASWorkflowProgressBar): Formatted test code

* feat(CombineGWASWorkflowProgressBar): Added Story Book for ProgressBar

* feat(CombineGWASWorkflowProgressBar): ran eslint on ProgressBar.test.jsx

* feat(CombineGWASWorkflowProgressBar): ran autoformatters eslint and stylelint

* feat(CombineGWASWorkflowProgressBar): Resolved style lint error in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): Resolved remaining style lint errors in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Dockerfile

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Submission/MapDataModel.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file again  UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT fix

* feat(CombineGWASWorkflowProgressBar): Refactored code to use a constants file to make code more DRY

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Added media query so that button will not overlap progress bar on smaller screens

* feat(CombineGWASWorkflowProgressBar): Formatted CSS with line break

* feat(CombineGWASWorkflowProgressBar): Updated JEST test to use for loops

* feat(CombineGWASWorkflowProgressBar): Updated GWASContainer.jsx to use nextButtonEnabled boolean for disabling or enabling next button

* feat(CombineGWASWorkflowProgressBar): Ran eslint on  GWASContainer.jsx

* feat(eslintOnlyOnCurrentBranch): Added new command eslint-new (#1128)

* feat(eslintOnlyOnCurrentBranch): Added new command eslint-new

* feat(eslintOnlyOnCurrentBranch): Removed ignore pattern for json

* feat(eslintOnlyOnCurrentBranch): Reverted files changed in feat/vadc_sprint21

* feat(eslintOnlyOnCurrentBranch): Reverted additional files changed in feat/vadc_sprint21

* feat(eslintOnlyOnCurrentBranch): Updated r
eadme.md with info on linting

* feat(eslintOnlyOnCurrentBranch): Spell checked and edited new addition to README.md

* feat(eslintOnlyOnCurrentBranch): Updated to reference master instead of HEAD

* feat(eslintOnlyOnCurrentBranch): Updated command to only parse JS JSX and TSX files and quiet warnings

* feat(eslintOnlyOnCurrentBranch): Updated command to use ext from original command, but added additional ignore patterns

* feat(eslintOnlyOnCurrentBranch): Updated command to ignore yml files

* Feat/combine gwas workflow attrition table styling and setup (#1129)

* Feat/combine gwas workflow progress bar (#1125)

* Update node js and fix failing unit tests (#1119)

* fixed unhandled promise rejection

...which fixes locally failing jest test

* fix failing unit test for UserProfile

* udpate node js and npm for CI tests

* make test a bit more specific

* set node js to 16.x

* update node js to 16.x and npm to 8.15 in Dockerfile

* revert npm version change

* feat(CombineGWASWorkflowProgressBar): Initial commit

* feat(CombineGWASWorkflowProgressBar): created partially working prototype

* feat(CombineGWASWorkflowProgressBar): added logic for displaying select or edit for each step

* feat(CombineGWASWorkflowProgressBar): created CSS style sheet for new component and began overriding AntD styles to match design

* feat(CombineGWASWorkflowProgressBar): fixed colors to match design for numeric icons

* feat(CombineGWASWorkflowProgressBar): set width to container to 100%

* feat(CombineGWASWorkflowProgressBar): added animation

* feat(CombineGWASWorkflowProgressBar): added styles for Get Started button

* feat(CombineGWASWorkflowProgressBar): positioned get started button

* feat(CombineGWASWorkflowProgressBar): removed inline styles from ProgressBar.jsx

* feat(CombineGWASWorkflowProgressBar): formatted GWASContainer.jsx

* feat(CombineGWASWorkflowProgressBar): changed class name to progress-bar

* feat(CombineGWASWorkflowProgressBar): began authoring JEST test

* feat(CombineGWASWorkflowProgressBar): Added clarifying comment to jest test

* feat(CombineGWASWorkflowProgressBar): Formatted test code

* feat(CombineGWASWorkflowProgressBar): Added Story Book for ProgressBar

* feat(CombineGWASWorkflowProgressBar): ran eslint on ProgressBar.test.jsx

* feat(CombineGWASWorkflowProgressBar): ran autoformatters eslint and stylelint

* feat(CombineGWASWorkflowProgressBar): Resolved style lint error in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): Resolved remaining style lint errors in ProgressBar.css

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Dockerfile

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file Submission/MapDataModel.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): reverted unintentionally changed file again  UserProfile/UserProfile.test.jsx

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT fix

* feat(CombineGWASWorkflowProgressBar): Refactored code to use a constants file to make code more DRY

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Ran ESLINT on recently updated files

* feat(CombineGWASWorkflowProgressBar): Added media query so that button will not overlap progress bar on smaller screens

* feat(CombineGWASWorkflowProgressBar): Formatted CSS with line break

* feat(CombineGWASWorkflowProgressBar): Updated JEST test to use for loops

* feat(CombineGWASWorkflowProgressBar): Updated GWASContainer.jsx to use nextButtonEnabled boolean for disabling or enabling next button

* feat(CombineGWASWorkflowProgressBar): Ran eslint on  GWASContainer.jsx

Co-authored-by: pieterlukasse <pieterlukasse@gmail.com>

* feat(CombineGWASWorkflowAttritionTable): Initial Commit, not working yet

* feat(CombineGWASWorkflowAttritionTable): Added eslint-new command to this branch

* feat(CombineGWASWorkflowProgressBar): Updated file references in AttritionTable imports

* feat(CombineGWASWorkflowProgressBar): Created partially working prototype (shows some data, no headers, has js errors)

* feat(CombineGWASWorkflowAttritionTable): Added table header obj to constants.js

* feat(CombineGWASWorkflowAttritionTable): Added table headerDataSource obj to constants and ran eslint-new

* feat(CombineGWASWorkflowAttritionTable): updated tableHeader in GWASContainer.jsx

* feat(CombineGWASWorkflowAttritionTable): began styling table

* feat(CombineGWASWorkflowAttritionTable): made alternating table rows different colors

* feat(CombineGWASWorkflowAttritionTable): added table borders

* feat(CombineGWASWorkflowAttritionTable): ran stylelint

* feat(CombineGWASWorkflowAttritionTable): created ChartIcons directory and refactored to use more semantic HTML

* feat(CombineGWASWorkflowAttritionTable): added SVG icons

* feat(CombineGWASWorkflowAttritionTable): Updated dropdown icon styling

* feat(CombineGWASWorkflowAttritionTable): Removed unneeded files and updated padding on table

* feat(CombineGWASWorkflowAttritionTable): Reset files unrelated to this ticket

* feat(CombineGWASWorkflowAttritionTable): Updated dropdown button styles

* feat(CombineGWASWorkflowAttritionTable): Updated attrition table logic, styles and storybook to not use antD list component, to avoid injection of non-tabular elements in table element

* feat(CombineGWASWorkflowAttritionTable): Converted inline styles to class names

* feat(CombineGWASWorkflowAttritionTable): Updated padding left class to 26px

* feat(CombineGWASWorkflowAttritionTable): Ran eslint-new on branch and fixed errors

* feat(CombineGWASWorkflowAttritionTable): Ran stylelint on branch and fixed errors

* feat(CombineGWASWorkflowAttritionTable): Reverted unintentionally changed ProgressBar.test.jsx file

* feat(CombineGWASWorkflowsAttritionTable): Made SVG more accessible

* feat(CombineGWASWorkflowAttritionTable): Changed title elements to desc to avoid hover effect in browser - additional accessible text will be added once chart fires modal

* feat(CombineGWASWorkflowAttritionTable): Removed inline comments in AttritionTableRow.jsx, they've been logged in a ticket instead

* feat(CombineGWASWorkflowAttritionTable): Clarified comment in AttritionTableRow.jsx

* feat(CombineGWASWorkflowAttritionTable): Made CSS consistent for colors in AttritionTable.css

* feat(CombineGWASWorkflowAttritionTable): Created new CSS rule to make stylesheet more DRY

* feat(CombineGWASWorkflowsAttritionTable): Cleaned up JS formating in AttritionTable.jsx

Co-authored-by: pieterlukasse <pieterlukasse@gmail.com>

* chore(euler/venn): add "@upsetjs/venn.js": "^1.4.2"

* feat(euler/venn): add simple euler diagram component

 - uses venn.js and queries cohorts and cohort overlap endpoint

* chore(euler/venn): pin uglify-js and ansi-regex

...shoud solve snyk issue

* feat(vadc_sprint21): Removed console.log statements from CohortsOverlapDiagram.stories.jsx

* feat(vadc_sprint21): Removed console logs from AttritionTable.stories.jsx

Co-authored-by: pieterlukasse <pieterlukasse@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants