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

Dicom viewer update #1176

Closed
wants to merge 19 commits into from
Closed

Conversation

frankliuao
Copy link
Contributor

Jira Ticket: MIDRC-76

New Features

DICOM button hiding merged to slow guppy fix.
To be merged together with master. Hopefully this is a good way to do this.

george42-ctds and others added 19 commits October 10, 2022 07:00
Co-authored-by: cmlsn <100160785+cmlsn@users.noreply.github.com>
* fix: skip empty tags in discovery page

* fix: shorten checks for empty tags
* Style/gwas pipeline padding (#1111)

* style(gwasPipelinePadding): removed <hr /> element from CovariateReview and added inline styles to better vertically center tutorial button on GWASCaseControl

* style(gwasPipelinePadding): removed <hr /> element from OutcomeSelectReview and added inline styles to GWASQuantitative

* style(gwasPipelinePadding): added class and style for asterisks

* style(gwasPipelinePadding): removed unneeded obj for housing styles in GWASQuantitative

* style(gwasPipelinePadding): refactored code to avoid using negative margin values

* style(gwasPipelinePadding): converted inline styles to use a class

* style(gwasPipelinePadding): converted inline styles for no padding to use a class

* style(gwasPipelinePadding): converted inline styles for no padding to use a class for GWASQuantitative

* style(gwasPipelinePadding): made class name for asterisk consistent with rest of codebase

* style(gwasPipelinePadding): fixed formatting issue in GWASQuantitative.jsx

* style(gwasPipelinePadding): ran eslint to format files

* style(gwasPipelinePadding): removed top spacing on Dichotomous selection and capitalized Cohort

* style(gwasPipelinePadding): offset asterisk spacing per stakeholder advisement

* style(gwasPipelinePadding): removed additional top padding in CustomDichotomousSelect.jsx

* feat(VADC-261): add combined gwas steps template (#1114)

* feat(VADC-261): add combined gwas steps template

* fix(VADC-261): change step 4 label

* fix(VADC-261): typo

* Improve workflow list refresh (#1113)

* improve workflow list fetch mechanism and decrease interval

add storybook test for workflow list

add refetchInterval to workflow list and update test

add "phase" to workflow and to keys of useQuery and change test

... this will ensure the endpoint is called again if the status of the workflow changes

set workflow list refresh interval to 5s

* removing old reference to refreshWorkflows

* Feat/combine gwas workflow view1 (#1117)

* feat(CombineGWASWorkflowView1): Added bolerplate files

* feat(CombineGWASWorkflowView1): created working prototype

* feat(CombineGWASWorkflowView1): updated layout to better match design

* feat(CombineGWASWorkflowView1): updated code organization to use utils and shared folder

* feat(CombineGWASWorkflowView1): moved util files to utils folder in SelectStudyPopulation and updated refs

* feat(CombineGWASWorkflowView1): formatted CSS and removed unneeded JSX space element

* feat(CombineGWASWorkflowView1): Cleaned up CSS

* feat(CombineGWASWorkflowView1): Updated text in button and moved state to parent

* feat(CombineGWASWorkflowView1): updated child to use state from parent

* feat(CombineGWASWorkflowView1): Fixed Eslint issues on AddCohortButton

* feat(CombineGWASWorkflowView1): Fixed Eslint issues on CohortDefinitions

* feat(CombineGWASWorkflowView1): Fixed Eslint issues on CohortDefinations

* feat(CombineGWASWorkflowView1) Resolved ESLINT issues with SelectStudyPopulation

* feat(CombineGWASWorkflowView1) Resolved ESLINT issues with GWASContainer.jsx and cohortMiddlewareApi

* feat(CombineGWASWorkflowView1) Resolved ESLINT issues with GWASContainer.jsx props

* feat(CombineGWASWorkflowView1) Removed unneeded steps component and logic from GWASContainer

* feat(CombineGWASWorkflowView1) Added workflow specific wrapping CSS class so style changes do not impact other workflows

* feat(CombineGWASWorkflowView1): created a story book to mock CohortSelect

* feat(CombineGWASWorkflowView1): removed unneeded imports from GWASContainer.jsx

* feat(CombineGWASWorkflowView1): set button styles so they render for story book and app

* feat(CombineGWASWorkflowView1): Formatted code for clarity in CohortSelect.stories

* feat(CombineGWASWorkflowView1): Added clarifying comment to explain eslint-disable-next-line in CohortSelect.jsx

* feat(CombineGWASWorkflowView1): organized CSS

* feat(CombineGWASWorkflowView1): ran stylelint auto fix for css files

* feat(CombineGWASWorkflowView1): ensure form field and button are perfectly aligned

* feat(CombineGWASWorkflowView1): updated state name to selectedStudyPopulationCohort per PR review recommendation

* feat(CombineGWASWorkflowView1): removed unneeded var and prop otherCohortSelected

* feat(CombineGWASWorkflowView1): removed unneeded var and prop otherCohortSelected from CohortDefinations.jsx

* feat(CombineGWASWorkflowView1): removed unneeded var and prop otherCohortSelected from CohortSelect.jsx

* feat(CombineGWASWorkflowView1): updated var name from fields to field in SearchBar.jsx

* feat(CombineGWASWorkflowView1): updated var name from fields to field in CohortSelect.jsx

Co-authored-by: Jarvis <113449836+jarvisraymond-uchicago@users.noreply.github.com>
Co-authored-by: Ali Lahrime <90918464+alilahrime@users.noreply.github.com>
* 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
* new GA4 install

* update

* fix ejs

* fix ejs

* fix array

* fix

* test lib

* fix

* test

* fix

* update

* change

* change

* csp

* update

* change

* debug setup

* disable debug

* test

* webpack

* mode change

* simple

* dev update

* remove debug from code

* ga for all bundle roots

* lint

* update basename
* 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>
Co-authored-by: Mingfei Shao <2475897+mfshao@users.noreply.github.com>
@frankliuao
Copy link
Contributor Author

Duplicate of PR #1174 and #1173 . Easier just to merge them separately based on a comment by @m0nhawk

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.

6 participants