diff --git a/framework/src/responses/sections/beaconFilteringTermsResults.yaml b/framework/src/responses/sections/beaconFilteringTermsResults.yaml index f0a654b4..9d362ee0 100644 --- a/framework/src/responses/sections/beaconFilteringTermsResults.yaml +++ b/framework/src/responses/sections/beaconFilteringTermsResults.yaml @@ -47,7 +47,7 @@ $defs: - 'B Lymphoblastic Leukemia/Lymphoma' - 'Aplasia/Hypoplasia of the middle ear' scopes: - description: >- + description: >- Entry types affected by this filter. examples: - diff --git a/models/json/beacon-v2-default-model/analyses/filteringTerms.json b/models/json/beacon-v2-default-model/analyses/filteringTerms.json index 9cd753de..3114eb83 100644 --- a/models/json/beacon-v2-default-model/analyses/filteringTerms.json +++ b/models/json/beacon-v2-default-model/analyses/filteringTerms.json @@ -1,4 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "filteringTerms": [] + "items": { + "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm" + }, + "type": "array" } \ No newline at end of file diff --git a/models/json/beacon-v2-default-model/biosamples/filteringTerms.json b/models/json/beacon-v2-default-model/biosamples/filteringTerms.json index 9cd753de..3114eb83 100644 --- a/models/json/beacon-v2-default-model/biosamples/filteringTerms.json +++ b/models/json/beacon-v2-default-model/biosamples/filteringTerms.json @@ -1,4 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "filteringTerms": [] + "items": { + "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm" + }, + "type": "array" } \ No newline at end of file diff --git a/models/json/beacon-v2-default-model/cohorts/filteringTerms.json b/models/json/beacon-v2-default-model/cohorts/filteringTerms.json index d53359eb..3114eb83 100644 --- a/models/json/beacon-v2-default-model/cohorts/filteringTerms.json +++ b/models/json/beacon-v2-default-model/cohorts/filteringTerms.json @@ -1,11 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "filteringTerms": [ - { - "ftType": "ontologyTerm", - "id": "DUO:0000006", - "label": "health or medical or biomedical research", - "version": "2021-02-23" - } - ] + "items": { + "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm" + }, + "type": "array" } \ No newline at end of file diff --git a/models/json/beacon-v2-default-model/datasets/filteringTerms.json b/models/json/beacon-v2-default-model/datasets/filteringTerms.json index d53359eb..3114eb83 100644 --- a/models/json/beacon-v2-default-model/datasets/filteringTerms.json +++ b/models/json/beacon-v2-default-model/datasets/filteringTerms.json @@ -1,11 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "filteringTerms": [ - { - "ftType": "ontologyTerm", - "id": "DUO:0000006", - "label": "health or medical or biomedical research", - "version": "2021-02-23" - } - ] + "items": { + "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm" + }, + "type": "array" } \ No newline at end of file diff --git a/models/json/beacon-v2-default-model/genomicVariations/filteringTerms.json b/models/json/beacon-v2-default-model/genomicVariations/filteringTerms.json index 3241f227..3114eb83 100644 --- a/models/json/beacon-v2-default-model/genomicVariations/filteringTerms.json +++ b/models/json/beacon-v2-default-model/genomicVariations/filteringTerms.json @@ -1,13 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "filteringTerms": [ - { - "ftType": "alphanumeric", - "id": "gene" - }, - { - "ftType": "alphanumeric", - "id": "aminoacidChanges" - } - ] + "items": { + "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm" + }, + "type": "array" } \ No newline at end of file diff --git a/models/json/beacon-v2-default-model/individuals/filteringTerms.json b/models/json/beacon-v2-default-model/individuals/filteringTerms.json index 9cd753de..3114eb83 100644 --- a/models/json/beacon-v2-default-model/individuals/filteringTerms.json +++ b/models/json/beacon-v2-default-model/individuals/filteringTerms.json @@ -1,4 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "filteringTerms": [] + "items": { + "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm" + }, + "type": "array" } \ No newline at end of file diff --git a/models/json/beacon-v2-default-model/runs/filteringTerms.json b/models/json/beacon-v2-default-model/runs/filteringTerms.json index 9cd753de..3114eb83 100644 --- a/models/json/beacon-v2-default-model/runs/filteringTerms.json +++ b/models/json/beacon-v2-default-model/runs/filteringTerms.json @@ -1,4 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "filteringTerms": [] + "items": { + "$ref": "https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm" + }, + "type": "array" } \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/analyses/filteringTerms.yaml b/models/src/beacon-v2-default-model/analyses/filteringTerms.yaml index 0701175c..27927183 100644 --- a/models/src/beacon-v2-default-model/analyses/filteringTerms.yaml +++ b/models/src/beacon-v2-default-model/analyses/filteringTerms.yaml @@ -1,2 +1,4 @@ $schema: https://json-schema.org/draft/2020-12/schema -filteringTerms: [] +type: array +items: + $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml b/models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml index 0701175c..27927183 100644 --- a/models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml +++ b/models/src/beacon-v2-default-model/biosamples/filteringTerms.yaml @@ -1,2 +1,4 @@ $schema: https://json-schema.org/draft/2020-12/schema -filteringTerms: [] +type: array +items: + $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/cohorts/filteringTerms.yaml b/models/src/beacon-v2-default-model/cohorts/filteringTerms.yaml index 92b6ef65..27927183 100644 --- a/models/src/beacon-v2-default-model/cohorts/filteringTerms.yaml +++ b/models/src/beacon-v2-default-model/cohorts/filteringTerms.yaml @@ -1,6 +1,4 @@ $schema: https://json-schema.org/draft/2020-12/schema -filteringTerms: - - ftType: ontologyTerm - id: DUO:0000006 - label: health or medical or biomedical research - version: '2021-02-23' +type: array +items: + $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/datasets/filteringTerms.yaml b/models/src/beacon-v2-default-model/datasets/filteringTerms.yaml index 92b6ef65..27927183 100644 --- a/models/src/beacon-v2-default-model/datasets/filteringTerms.yaml +++ b/models/src/beacon-v2-default-model/datasets/filteringTerms.yaml @@ -1,6 +1,4 @@ $schema: https://json-schema.org/draft/2020-12/schema -filteringTerms: - - ftType: ontologyTerm - id: DUO:0000006 - label: health or medical or biomedical research - version: '2021-02-23' +type: array +items: + $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/genomicVariations/filteringTerms.yaml b/models/src/beacon-v2-default-model/genomicVariations/filteringTerms.yaml index ca25a1cd..27927183 100644 --- a/models/src/beacon-v2-default-model/genomicVariations/filteringTerms.yaml +++ b/models/src/beacon-v2-default-model/genomicVariations/filteringTerms.yaml @@ -1,6 +1,4 @@ $schema: https://json-schema.org/draft/2020-12/schema -filteringTerms: - - ftType: alphanumeric - id: gene - - ftType: alphanumeric - id: aminoacidChanges +type: array +items: + $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/individuals/filteringTerms.yaml b/models/src/beacon-v2-default-model/individuals/filteringTerms.yaml index 0701175c..27927183 100644 --- a/models/src/beacon-v2-default-model/individuals/filteringTerms.yaml +++ b/models/src/beacon-v2-default-model/individuals/filteringTerms.yaml @@ -1,2 +1,4 @@ $schema: https://json-schema.org/draft/2020-12/schema -filteringTerms: [] +type: array +items: + $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm \ No newline at end of file diff --git a/models/src/beacon-v2-default-model/runs/filteringTerms.yaml b/models/src/beacon-v2-default-model/runs/filteringTerms.yaml index 0701175c..27927183 100644 --- a/models/src/beacon-v2-default-model/runs/filteringTerms.yaml +++ b/models/src/beacon-v2-default-model/runs/filteringTerms.yaml @@ -1,2 +1,4 @@ $schema: https://json-schema.org/draft/2020-12/schema -filteringTerms: [] +type: array +items: + $ref: https://raw.githubusercontent.com/ga4gh-beacon/beacon-v2/main/framework/json/responses/sections/beaconFilteringTermsResults.json#/definitions/FilteringTerm \ No newline at end of file