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

PXP-6409 Remove arranger #743

Merged
merged 4 commits into from
Oct 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ module.exports = {
"no-loop-func": "off" // for D3 config
}
},
{
"files": [ "src/Explorer/ExplorerTable.jsx" ],
"rules": {
"jsx-a11y/anchor-is-valid": "off" // for relative links
}
},
{
"files": [ "src/QueryNode/QueryForm.jsx" ],
"rules": {
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ FROM ubuntu:18.04

ENV DEBIAN_FRONTEND=noninteractive
ENV REACT_APP_PROJECT_ID=search
ENV REACT_APP_ARRANGER_API=/api/v0/flat-search

RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
Expand Down
24 changes: 0 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,30 +78,6 @@ deploy-time configuration. The `GEN3_BUNDLE` environment variable determines wh
To run Storybook:
`npm run storybook`


To run with Arranger components *(DEPRECATED: we use Guppy powered explorer page and stop maintaining arranger powered version.)*:
1. Set local environment variables:
- $STORYBOOK_ARRANGER_API: localhost:3000
- $STORYBOOK_PROJECT_ID: search
- $REACT_APP_ARRANGER_API: /api/v0/flat-search
- $REACT_APP_PROJECT_ID: search
2. Run ElasticSearch at localhost:9200
3. Clone and `cd` into `gen3-arranger`. Run:
```cd Docker/Stacks
docker-compose -f esearch.yml up -d
export ESHOST=localhost:9200
source esearch/indexSetup.sh
es_indices
es_delete_all
es_setup_index
es_gen_data 0 20
```
4. Follow the [Arranger](https://github.com/overture-stack/arranger) setup steps - run the server and the dashboard.
5. At the Arranger Dashboard (localhost:6060), add a new version called 'dev'.
6. Click on 'dev' and add a new index. Name: subject, Index: gen3-dev-subject, ES Type: subject.
7. Go back to Versions and hit the lightning bolt. The endpoint should go from a red arrow to a green arrow.
8. At this point, running the Data Portal from our Storybook should work.

### Run Windmill using Docker
Build the container image first
```
Expand Down
6 changes: 0 additions & 6 deletions data/config/anvil.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,6 @@
}
]
},
"arrangerConfig": {
"projectId": "search",
"graphqlField": "case",
"index": "",
"nodeCountField": "node_id"
},
"table": {
"enabled": true
},
Expand Down
6 changes: 0 additions & 6 deletions data/config/bhc.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,6 @@
"experimental_group"
]
},
"arrangerConfig": {
"projectId": "search",
"graphqlField": "case",
"index": "",
"nodeCountField": "node_id"
},
"guppyConfig": {
"dataType": "case",
"nodeCountTitle": "Cases",
Expand Down
6 changes: 0 additions & 6 deletions data/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,6 @@
"analysis": false
},
"dataExplorerConfig": {
"arrangerConfig": {
"projectId": "search",
"graphqlField": "subject",
"index": "",
"nodeCountField": "node_id"
},
"charts": {
"project": {
"chartType": "count",
Expand Down
16 changes: 2 additions & 14 deletions data/config/gtex.json
Original file line number Diff line number Diff line change
Expand Up @@ -290,18 +290,6 @@
"dropdownId": "export"
}
],
"arrangerConfig": {
"projectId": "search",
"graphqlField": "subject",
"index": "",
"manifestMapping": {
"resourceIndexType": "file",
"resourceIdField": "object_id",
"referenceIdFieldInResourceIndex": "subject_id",
"referenceIdFieldInDataIndex": "subject_id"
},
"nodeCountField": "subject_id"
},
"guppyConfig": {
"dataType": "subject",
"nodeCountTitle": "Subjects",
Expand Down Expand Up @@ -344,7 +332,7 @@
},
"getAccessButtonLink": "https://dbgap.ncbi.nlm.nih.gov/",
"terraExportURL": "https://bvdp-saturn-dev.appspot.com/#import-data",
"terraTemplate": [
"terraTemplate": [
"bdc",
"gen3"
]
Expand Down Expand Up @@ -417,4 +405,4 @@
],
"dropdowns": {}
}
}
}
6 changes: 0 additions & 6 deletions data/config/kfDcfInterop.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,6 @@
}
]
},
"arrangerConfig": {
"projectId": "search",
"graphqlField": "case",
"index": "",
"nodeCountField": "node_id"
},
"table": {
"enabled": true
},
Expand Down
8 changes: 1 addition & 7 deletions data/config/ncrdc-demo.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,6 @@
"rightIcon": "download",
"fileName": "manifest.json"
}
],
"arrangerConfig": {
"projectId": "search",
"graphqlField": "subject",
"index": "",
"nodeCountField": "node_id"
}
]
}
}
13 changes: 0 additions & 13 deletions data/config/va.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,19 +219,6 @@
],
"table": {
"enabled": true
},
"arrangerConfig": {
"projectId": "search",
"graphqlField": "patients",
"index": "",
"nodeCountField": "Chicago_ID",
"manifestMapping": {
"resourceIndexType": "file",
"resourceIdField": "object_id",
"referenceIdFieldInResourceIndex": "case_id",
"referenceIdFieldInDataIndex": "object_id",
"divideKey": "data_type"
}
}
}
}
Loading