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/guppy explorer #505

Merged
merged 40 commits into from
Apr 24, 2019
Merged

Feat/guppy explorer #505

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
0050ca0
feat(guppy): Guppy data explorer
qingyashu Mar 14, 2019
c7c0f0d
fix(table): table components connected to guppy
qingyashu Mar 20, 2019
5c5773f
feat(query): connect query page to guppy
qingyashu Mar 21, 2019
3bc3fcf
fix(docker): add perm-unsage to npm ci to support prepared dist files
qingyashu Mar 21, 2019
46f1feb
fix(config): change some config to support multi index
qingyashu Mar 28, 2019
3fb25f0
fix(package): point to branch
qingyashu Mar 28, 2019
2673cef
feat(manifest): manifest button
qingyashu Apr 11, 2019
1d0c684
fix(merge): Merge branch 'master' into feat/guppy-explorer
qingyashu Apr 11, 2019
b73227b
fix(style): fix some styles and refactor some files
qingyashu Apr 11, 2019
468bb60
fix(url): fix url for query page
qingyashu Apr 11, 2019
e5b195a
fix(style): improve some styles and table props
qingyashu Apr 12, 2019
b285865
fix(manifest): add manifest block into portal config
qingyashu Apr 12, 2019
9a19e5a
feat(config): refine config and make explorer backward compatible
qingyashu Apr 13, 2019
79040d6
feat(workspace): add export to workspace
qingyashu Apr 13, 2019
ebe1d1e
fix(table): only first 10000 records visible in table
qingyashu Apr 13, 2019
0527ef6
fix(branch): hard code commit hash to trigger build
qingyashu Apr 14, 2019
67fbc70
fix(version): change back from hard code branch to master branch
qingyashu Apr 15, 2019
40c958a
Merge branch 'master' into feat/guppy-explorer
qingyashu Apr 15, 2019
863756b
fix(query): fix query page, if no guppy, use arranger
qingyashu Apr 15, 2019
0dae0fa
fix(config): move config to localconf
qingyashu Apr 16, 2019
5ff9405
fix(default): remove default guppy block
qingyashu Apr 16, 2019
69d2e15
fix(typo): missing curly brace
qingyashu Apr 16, 2019
b1d2ac9
fix(change): change back to previous config
qingyashu Apr 16, 2019
f6d5152
fix(branch): refer commit number to let portal hard pull the newest
qingyashu Apr 16, 2019
ca56214
fix(package): hard change package-lock again
qingyashu Apr 16, 2019
2fe7d7d
fix(configs): change back configs, also add nhd and bhc config
qingyashu Apr 16, 2019
d1de58d
feat(totalcount): add totalcount to default count charts
qingyashu Apr 17, 2019
161106c
fix(comments): fix for comments
qingyashu Apr 18, 2019
5e9931b
(fix): Merge branch 'master' into feat/guppy-explorer
qingyashu Apr 18, 2019
3198670
fix(names): change case name to customizable one
qingyashu Apr 18, 2019
927f2e6
feat(names): automate field names
qingyashu Apr 19, 2019
6b86a23
fix(Guppy/Explorer): export to workspace functionality for guppy impl…
benJrohrer Apr 22, 2019
3be1472
chore(Explorer): style fix
benJrohrer Apr 22, 2019
f3e1b42
fix(merge): Merge branch 'master' into feat/guppy-explorer
qingyashu Apr 23, 2019
c4b634f
fix(conflict): resolve conflict
qingyashu Apr 23, 2019
d6d4589
fix(package): remove unused packages
qingyashu Apr 23, 2019
feeea04
fix(fileCount): revert fileCount to previous
qingyashu Apr 23, 2019
73fa9a3
fix(version): change guppy version to master
qingyashu Apr 24, 2019
c229354
Export to PFB (#511)
benJrohrer Apr 24, 2019
8c8a7b5
fix(merge): Merge branch 'master' into feat/guppy-explorer
qingyashu Apr 24, 2019
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
51 changes: 42 additions & 9 deletions data/config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@
"explorer": true
},
"dataExplorerConfig": {
"arrangerConfig": {
"projectId": "search",
"graphqlField": "subject",
"index": "",
"nodeCountField": "node_id"
},
"charts": {
"project": {
"chartType": "count",
Expand Down Expand Up @@ -237,12 +243,6 @@
}
]
},
"arrangerConfig": {
"projectId": "search",
"graphqlField": "subject",
"index": "",
"nodeCountField": "node_id"
},
"buttons": [
{
"enabled": true,
Expand All @@ -254,15 +254,48 @@
},
{
"enabled": true,
"type": "export-to-workspace",
"title": "Export To Workspace",
"type": "manifest",
"title": "Download Manifest",
"leftIcon": "datafile",
"rightIcon": "download",
"fileName": "manifest.json"
}
],
"table": {
"enabled": true
"enabled": true,
"fields": [
"project",
"study",
"race",
"ethnicity",
"gender",
"vital_status",
"whatever_lab_result_value",
"file_count",
"file_type",
"file_format"
]
},
"guppyConfig": {
"dataType": "subject",
"fieldMapping": [
{ "field": "project", "name": "Project" },
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we automate this part to only configure the special mapping?
I mean if it is only project -> Project or vital_status -> Vital Status you don't need to put it in the fieldMapping.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think sometimes some field name mapping will need more caring, like thrpyv, but yeah automation is a good idea, I think we could combine both automation and customized names

{ "field": "study", "name": "Study" },
{ "field": "race", "name": "Race" },
{ "field": "ethnicity", "name": "Ethnicity" },
{ "field": "gender", "name": "Gender" },
{ "field": "vital_status", "name": "Vital Status" },
{ "field": "whatever_lab_result_value", "name": "Lab Result Value" },
{ "field": "file_count", "name": "File Count" },
{ "field": "file_type", "name": "File Type" },
{ "field": "file_format", "name": "File Format" }
],
"manifestMapping": {
"resourceIndexType": "file",
"resourceIdField": "file_id",
"referenceIdFieldInResourceIndex": "subject_id",
"referenceIdFieldInDataIndex": "subject_id"
}
}
}
}
Loading