Skip to content
This repository has been archived by the owner on Sep 17, 2019. It is now read-only.

Commit

Permalink
Patch Release 8/8 (#127)
Browse files Browse the repository at this point in the history
* disable cache on ie11, download files, dul link fixes

* added expires header

* configure proxy cache header

* data owner review - dul download

* DUOS public pages and changes on header and footer

* Add validation endpoint

* Fix YAML file (#117)

* Minor fix on default route and warnings removal

* ie tooltip and loop in stateChangeStart fix

* Change yaml files

* Add Dar POst Documentation

* DUOS-132: Update config to use authenticated API
  • Loading branch information
rushtong authored Aug 8, 2016
1 parent 1e0bc9e commit 790bea4
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 8 deletions.
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"apiUrl": "https://consent.dsde-consent-prod.broadinstitute.org/",
"apiUrl": "https://consent.dsde-consent-prod.broadinstitute.org/api/",
"ontologyApiUrl": "https://consent-ontology.dsde-consent-prod.broadinstitute.org/",
"clientId": "1019469328169-uk6592ph25b0nijc0nm7s2dss4qm2nbu.apps.googleusercontent.com",
"gwasUrl":"http://epi.grants.cancer.gov/dac/examples.html"
Expand Down
2 changes: 1 addition & 1 deletion src/app/configuration/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
angular.module('ConsentConfiguration', [])
.constant('apiUrl', "https://consent.dsde-consent-prod.broadinstitute.org/")
.constant('apiUrl', "https://consent.dsde-consent-prod.broadinstitute.org/api/")
.constant('ontologyApiUrl', "https://consent-ontology.dsde-consent-prod.broadinstitute.org/")
.constant('clientId', "1019469328169-uk6592ph25b0nijc0nm7s2dss4qm2nbu.apps.googleusercontent.com")
.constant('gwasUrl', "http://epi.grants.cancer.gov/dac/examples.html");
114 changes: 109 additions & 5 deletions swagger/consents-swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -734,15 +734,14 @@ paths:
- name: dar
in: body
description: The fields that represent a DAR, json format.
required: true
schema:
type: string
$ref: '#/definitions/DataAccessRequest'
tags:
- Data Access Request
responses:
'200':
description: Returns the created Data Access Request, json file.
schema:
$ref: '#/definitions/DataAccessRequest'
'500':
description: Internal Server Error.
get:
Expand Down Expand Up @@ -823,7 +822,7 @@ paths:
'200':
description: 'Returns a DARModalDetailsDTO initialized with the DAR associated with the provided Id.'
'/dar/find/{id}':
delete:
get:
summary: describeSpecificFields
description: Returns the requested fields present in the DAR identified by the ID
parameters:
Expand All @@ -847,7 +846,7 @@ paths:
'404':
description: The requested DAR couldn't be found.
'/dar/find/{id}/consent':
delete:
get:
summary: describeConsentForDAR
description: Returns the consent related to this DAR.
parameters:
Expand Down Expand Up @@ -1923,6 +1922,111 @@ definitions:
description: The datetime the election was created/updated (the last updated).
DataAccessRequest:
type: object
properties:
investigator:
type: string
description: 'Describes the name of the Principal Investigator.'
institution:
type: string
description: 'Describes the name of Institution.'
department:
type: string
description: 'Describes the name of the Institution Department.'
division:
type: string
description: 'Describes the name of the Division.'
address1:
type: string
description: 'Describes the principal address.'
address2:
type: string
description: 'Describes the secondary address. Optional.'
city:
type: string
description: 'Describes the name of the City.'
state:
type: string
description: 'Describes the name of the State.'
zipcode:
type: string
description: 'Describes the Zip Code number.'
country:
type: string
description: 'Describes the name of the Country.'
projectTitle:
type: string
description: 'Describes the Project Title.'
datasetId:
type: array
items:
type: string
description: 'Array of Dataset Ids.'
rus:
type: string
description: 'Describes the Research Use Statement.'
non_tech_rus:
type: string
description: 'Describes the Non Technical Summary.'
diseases:
type: boolean
description: 'Defines if the purpose of the study is disease-related.'
methods:
type: boolean
description: 'Defines if the purpose of the study is for Methods development.'
controls:
type: boolean
description: 'Defines if the purpose of the study is to increase the number of controls available for a comparison group.'
population:
type: boolean
description: 'Defines if the purpose of the study is to understand variation in the general population.'
other:
type: boolean
description: 'Defines if the purpose of the study is other than the above. If TRUE, triggers MANUAL REVIEW.'
othertext:
type: string
description: 'Describes above field.'
ontologies:
type: array
items:
type: string
description: 'Array of Ontologies.'
forProfit:
type: boolean
description: 'Describes if data will be used for commercial purposes.'
oneGender:
type: boolean
description: 'Describes if study is gender specific.'
pediatric:
type: boolean
description: 'Describes if study is restricted to a pediatric population.'
illegalbehave:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
addiction:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
sexualdiseases:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
stigmatizediseases:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
vulnerablepop:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
popmigration:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
psychtraits:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
nothealth:
type: boolean
description: 'If TRUE, triggers MANUAL REVIEW.'
userId:
type: integer
format: int32
description: 'Describes the id of the User (Researcher).'
DataAccessRequestManage:
type: object
properties:
Expand Down
21 changes: 20 additions & 1 deletion swagger/ontology-swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,28 @@ paths:
- Autocomplete
responses:
'200':
description: The consent association representation is present in the body of the response.
description: Array of results.
default:
description: Unexpected error

'/search':

get:
summary: search
description: Find ontologies based on the id.
parameters:
- name: id
in: query
description: The ontology id which the service us to find it (e.g. DOID_4).
required: true
type: string
tags:
- Search
responses:
'200':
description: The given id was found. Json result with ontology information.
default:
description: Unexpected error

definitions:
Restriction:
Expand Down Expand Up @@ -153,3 +171,4 @@ definitions:
items:
type: string
description: Array of ontologies.

0 comments on commit 790bea4

Please sign in to comment.