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 sprint22 #1451

Merged
merged 41 commits into from
Nov 14, 2023
Merged

Feat/vadc sprint22 #1451

merged 41 commits into from
Nov 14, 2023

Conversation

jarvisraymond-uchicago
Copy link
Contributor

@jarvisraymond-uchicago jarvisraymond-uchicago commented Nov 13, 2023 •
edited
Loading

Jira Ticket: VADC-761
Jira Ticket: VADC-788
Jira Ticket: VADC-760

New Features

  • Updates the three VADC analysis apps, Gen3 GWAS, GWAS Results and OHDSI Atlas to use API request including query parameter for team projects.
  • Adds selected team project in each of the apps: Atlas, GWAS App and Results App and reroutes user back to Analysis Apps view if they do not have a team project selected

Improvements

  • Lints TeamProjectModal.test.jsx to abide by code formatting style guide

Bug Fixes

pieterlukasse and others added 29 commits November 1, 2023 20:02
@pieterlukasse
feat: allow teamProject to be configured in gitops.json instead of ha…
d9bffbe 
…rd-coding in frontend code
@pieterlukasse
feat: allow for appId property in app definition
38deeeb 
...and if set, use that instead of "title"
@pieterlukasse
feat: added analysisTools section documentation to portal_config.md
5494f24
@pieterlukasse
fix: revert back the old GWAS app names
999cfc9 
...so navigation can work again as before
@jarvisraymond-uchicago
feat(addTeamProjecHeaderToAnalysisApps): Added header without logic t…
49bcf10 
…o redirect
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): added redirect logic
99d7d40
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Got test to work for TeamPr…
1c56169 
…ojectHeader conditional
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Ran eslint-new
11bc0f7
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Removed unneeded async decl…
63da886 
…aration
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Removed unneeded waitFor im…
9f619a1 
…port
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Fixed lint issues
b3183ea
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Removed header element to m…
417e874 
…ake styles more consistent across applications
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Removed unneeded comments
7b45be8
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Ran linter
1407d4e
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): Changed all instances of va…
02eff62 
…riable name showButton to isEditable
@jarvisraymond-uchicago
feat(addTeamProjectHeaderToAnalysisApps): updated storybook for clarity
22f8cfc
@nss10 @jarvisraymond-uchicago
Reload workspace options on paymodel change (#1447)
65dc4b0
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Initial commit
7856ed9
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Added API update for results app
97deb5e
@dependabot @jarvisraymond-uchicago
Chore(deps-dev): Bump @babel/traverse from 7.22.5 to 7.23.2 (#1440)
9361619 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.5 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Added conditional in AnalysisApp.jsx for …
4d14bff 
…OHDSI Atlas app iframe URL
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Refactored initializeCurrentState for ter…
857284b 
…seness
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): updated API endpoint per change in BE
9be5fd0
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): updated data passed to HomeTable componen…
21ae52c 
…t to support change in BE response
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): updated data passed to HomeTable test to …
37d814e 
…support change in BE response
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Reverted change on FE to deal with BE cha…
e77ab75 
…nge in DS, BE change was inadvertant
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Reverted unintentionally changed files
3c2fff6
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Removed unneeded console log statement
ff43102
@jarvisraymond-uchicago
feat(teamProjectApiUpdate): Changed OHSDI iframe src string based on …
bc98332 
…discussed with BE dev
@jarvisraymond-uchicago jarvisraymond-uchicago marked this pull request as ready for review November 13, 2023 17:50
pieterlukasse
pieterlukasse previously approved these changes Nov 13, 2023
View reviewed changes
Copy link
Contributor

@pieterlukasse pieterlukasse left a comment

Choose a reason for hiding this comment

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

🎉

@jarvisraymond-uchicago jarvisraymond-uchicago merged commit 901af7a into master Nov 14, 2023
4 checks passed
@jarvisraymond-uchicago jarvisraymond-uchicago deleted the feat/vadc_sprint22 branch November 14, 2023 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pieterlukasse pieterlukasse pieterlukasse approved these changes

Assignees
No one assigned
Labels
@requires-portal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jarvisraymond-uchicago @pieterlukasse @nss10