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

Merged
merged 41 commits into from
Nov 14, 2023
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d9bffbe
feat: allow teamProject to be configured in gitops.json instead of ha…
pieterlukasse Nov 1, 2023
38deeeb
feat: allow for appId property in app definition
pieterlukasse Nov 1, 2023
5494f24
feat: added analysisTools section documentation to portal_config.md
pieterlukasse Nov 2, 2023
999cfc9
fix: revert back the old GWAS app names
pieterlukasse Nov 2, 2023
49bcf10
feat(addTeamProjecHeaderToAnalysisApps): Added header without logic t…
jarvisraymond-uchicago Oct 30, 2023
99d7d40
feat(addTeamProjectHeaderToAnalysisApps): added redirect logic
jarvisraymond-uchicago Oct 31, 2023
1c56169
feat(addTeamProjectHeaderToAnalysisApps): Got test to work for TeamPr…
jarvisraymond-uchicago Nov 1, 2023
11bc0f7
feat(addTeamProjectHeaderToAnalysisApps): Ran eslint-new
jarvisraymond-uchicago Nov 1, 2023
63da886
feat(addTeamProjectHeaderToAnalysisApps): Removed unneeded async decl…
jarvisraymond-uchicago Nov 1, 2023
9f619a1
feat(addTeamProjectHeaderToAnalysisApps): Removed unneeded waitFor im…
jarvisraymond-uchicago Nov 1, 2023
b3183ea
feat(addTeamProjectHeaderToAnalysisApps): Fixed lint issues
jarvisraymond-uchicago Nov 1, 2023
417e874
feat(addTeamProjectHeaderToAnalysisApps): Removed header element to m…
jarvisraymond-uchicago Nov 1, 2023
7b45be8
feat(addTeamProjectHeaderToAnalysisApps): Removed unneeded comments
jarvisraymond-uchicago Nov 1, 2023
1407d4e
feat(addTeamProjectHeaderToAnalysisApps): Ran linter
jarvisraymond-uchicago Nov 1, 2023
02eff62
feat(addTeamProjectHeaderToAnalysisApps): Changed all instances of va…
jarvisraymond-uchicago Nov 6, 2023
22f8cfc
feat(addTeamProjectHeaderToAnalysisApps): updated storybook for clarity
jarvisraymond-uchicago Nov 6, 2023
65dc4b0
Reload workspace options on paymodel change (#1447)
nss10 Nov 6, 2023
7856ed9
feat(teamProjectApiUpdate): Initial commit
jarvisraymond-uchicago Nov 6, 2023
97deb5e
feat(teamProjectApiUpdate): Added API update for results app
jarvisraymond-uchicago Nov 6, 2023
9361619
Chore(deps-dev): Bump @babel/traverse from 7.22.5 to 7.23.2 (#1440)
dependabot[bot] Nov 6, 2023
4d14bff
feat(teamProjectApiUpdate): Added conditional in AnalysisApp.jsx for …
jarvisraymond-uchicago Nov 7, 2023
857284b
feat(teamProjectApiUpdate): Refactored initializeCurrentState for ter…
jarvisraymond-uchicago Nov 7, 2023
9be5fd0
feat(teamProjectApiUpdate): updated API endpoint per change in BE
jarvisraymond-uchicago Nov 7, 2023
21ae52c
feat(teamProjectApiUpdate): updated data passed to HomeTable componen…
jarvisraymond-uchicago Nov 8, 2023
37d814e
feat(teamProjectApiUpdate): updated data passed to HomeTable test to …
jarvisraymond-uchicago Nov 8, 2023
e77ab75
feat(teamProjectApiUpdate): Reverted change on FE to deal with BE cha…
jarvisraymond-uchicago Nov 8, 2023
3c2fff6
feat(teamProjectApiUpdate): Reverted unintentionally changed files
jarvisraymond-uchicago Nov 8, 2023
ff43102
feat(teamProjectApiUpdate): Removed unneeded console log statement
jarvisraymond-uchicago Nov 8, 2023
bc98332
feat(teamProjectApiUpdate): Changed OHSDI iframe src string based on …
jarvisraymond-uchicago Nov 8, 2023
597ab2e
Merge branch 'master' into feat/vadc_sprint22
jarvisraymond-uchicago Nov 13, 2023
612e7f2
feat(vadc_sprint22): Added sanitize function for team project variable
jarvisraymond-uchicago Nov 14, 2023
d738941
feat(vadc_sprint22): Added const var for team project variable
jarvisraymond-uchicago Nov 14, 2023
156b691
feat(vadc_sprint22): Refactored to use class function getAtlastURLWit…
jarvisraymond-uchicago Nov 14, 2023
72a0895
feat(vadc_sprint22): Autoformatted code
jarvisraymond-uchicago Nov 14, 2023
4beda9d
feat(vadc_sprint22): Updated regex and test for regex
jarvisraymond-uchicago Nov 14, 2023
cb9ffd0
feat(vadc_sprint22): formatted Code for linter
jarvisraymond-uchicago Nov 14, 2023
6f8e32a
feat(vadc_sprint22): Updated regex and autoformatted code
jarvisraymond-uchicago Nov 14, 2023
2ec64b7
feat(vadc_sprint22): Reverted changes for snyk
jarvisraymond-uchicago Nov 14, 2023
04cd8af
feat(vadc_sprint22): updated regex and added throw error
jarvisraymond-uchicago Nov 14, 2023
6a72842
fix: let teamproject be added to Atlas only if the needsTeamProject f…
pieterlukasse Nov 14, 2023
2262b48
Merge branch 'master' into feat/vadc_sprint22
jarvisraymond-uchicago Nov 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(teamProjectApiUpdate): updated data passed to HomeTable componen…
…t to support change in BE response
  • Loading branch information
jarvisraymond-uchicago committed Nov 8, 2023
commit 21ae52c29f0e0fe6ebc256ed282eb634d645285e
3 changes: 2 additions & 1 deletion src/Analysis/GWASResults/Views/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ const Home = () => {
if (status === 'error') {
return <LoadingErrorMessage />;
}
console.log("data",data)
return (
<React.Fragment>
<ManageColumns />
<HomeTable data={data} />
<HomeTable data={data[0]} />
</React.Fragment>
);
};
Expand Down