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

configurable brushes #87

Merged
merged 4 commits into from
Nov 11, 2019
Merged

configurable brushes #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e8db34
ignore pathdb relics
birm Nov 7, 2019
7c0be95
add 'configuration' collection for configuring preset labels.
nanli-emory Nov 8, 2019
5c0a8cb
Merge pull request #88 from camicroscope/master
birm Nov 11, 2019
d8680b1
Update quip-pathdb.yml
birm Nov 11, 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
2 changes: 2 additions & 0 deletions config/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pathdbmysql.cnf
pathdb/*.css
93 changes: 89 additions & 4 deletions config/bindaas_projects/caMicroscope.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,8 @@
},
"name": "csvFile",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin"
"createdBy": "admin",
"description": ""
},
"jsonFile": {
"type": "MULTIPART",
Expand All @@ -1295,7 +1296,8 @@
},
"name": "jsonFile",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin"
"createdBy": "admin",
"description": ""
},
"csv": {
"type": "FORM_DATA",
Expand All @@ -1304,7 +1306,8 @@
},
"name": "csv",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin"
"createdBy": "admin",
"description": ""
},
"json": {
"type": "FORM_DATA",
Expand All @@ -1313,7 +1316,8 @@
},
"name": "json",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin"
"createdBy": "admin",
"description": ""
}
},
"providerId": "edu.emory.cci.bindaas.datasource.provider.mongodb.MongoDBProvider",
Expand All @@ -1322,6 +1326,87 @@
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin",
"description": "log"
},
"Configuration": {
"dataSource": {
"host": "ca-mongo",
"port": "27017",
"db": "camic",
"collection": "configuration",
"initialize": true
},
"queryEndpoints": {
"getConfigByName": {
"queryTemplate": "{\n\t\"_operation\" : \"find\" ,\n\t\"_operation_args\" : {\n\t\t\t\t\t\t\t\"query\" : { \u0027config_name\u0027 : \"$name$\"} ,\n\t\t\t\t\t\t\t\"limit\" : 1\n\t\t\t\t\t\t}\n}\n ",
"metaData": {},
"tags": [],
"bindVariables": {
"name": {
"name": "name",
"required": true,
"defaultValue": "",
"description": ""
}
},
"stage": "UNVERIFIED",
"outputFormat": {
"outputFormat": "JSON"
},
"name": "getConfigByName",
"timeCreated": "Thu Nov 07 17:09:07 GMT 2019",
"createdBy": "admin",
"description": ""
}
},
"deleteEndpoints": {},
"submitEndpoints": {
"csvFile": {
"type": "MULTIPART",
"properties": {
"inputType": "CSV_FILE"
},
"name": "csvFile",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin",
"description": ""
},
"jsonFile": {
"type": "MULTIPART",
"properties": {
"inputType": "JSON_FILE"
},
"name": "jsonFile",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin",
"description": ""
},
"csv": {
"type": "FORM_DATA",
"properties": {
"inputType": "CSV"
},
"name": "csv",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin",
"description": ""
},
"json": {
"type": "FORM_DATA",
"properties": {
"inputType": "JSON"
},
"name": "json",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin",
"description": ""
}
},
"providerId": "edu.emory.cci.bindaas.datasource.provider.mongodb.MongoDBProvider",
"providerVersion": 1,
"name": "Configuration",
"timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
"createdBy": "admin",
"description": "configuration"
}
},
"params": {},
Expand Down
3 changes: 3 additions & 0 deletions config/routes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
},
"Log": {
"post": "/Log/submit/json"
},
"Configuration": {
"getConfigByName": "/Configuration/query/getConfigByName"
}
},
"private":{
Expand Down
1 change: 1 addition & 0 deletions data/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pathdb/mysql
2 changes: 1 addition & 1 deletion quip-pathdb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ services:
logging:
driver: none
pathdb:
build: "https://github.com/SBU-BMI/PathDB.git#1.2.3"
build: "https://github.com/SBU-BMI/PathDB.git#1.3.0"
container_name: quip-pathdb
restart: unless-stopped
ports: ["443:443","80:80"]
Expand Down