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

Patch/issues 486 492 #500

Merged
merged 6 commits into from
Aug 20, 2024
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
34,020 changes: 17,036 additions & 16,984 deletions NF.jsonld

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions modules/Assay/Assay.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ enums:
cell count:
description: A procedure to determine the number of cells in a sample. Also used to mean the result of such a procedure.
meaning: http://purl.obolibrary.org/obo/NCIT_C48938
cell painting:
source: https://www.nature.com/articles/nprot.2016.105
cell proliferation:
description: A cellular assay that allows for the measurement of the multiplication or reproduction of cells, resulting in the expansion of a cell population.
meaning: http://purl.obolibrary.org/obo/ERO_0000636
Expand Down
4 changes: 4 additions & 0 deletions modules/Assay/Platform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -290,3 +290,7 @@ enums:
Zeno Electronic Walkway:
description: System for gait analysis.
source: https://pubmed.ncbi.nlm.nih.gov/29286982/
ZetaView:
source: https://particle-metrix.com/zetaview/


1 change: 1 addition & 0 deletions modules/Template/Data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ classes:
- dissociationMethod
- runType
- libraryStrand
- libraryKitID
- libraryPrep
- libraryPreparationMethod
- readPair
Expand Down
6 changes: 3 additions & 3 deletions modules/props.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -578,9 +578,9 @@ slots:
range: PresenceEnum
required: false
title: Leukemia
libraryID:
description: ''
required: false
libraryKitID:
description: Library kit ID.
required: true
libraryPrep:
description: The general strategy by which the library was prepared
range: LibraryPrepEnum
Expand Down
1 change: 1 addition & 0 deletions registered-json-schemas/Dataset.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"CAPP-seq",
"cell competition",
"cell count",
"cell painting",
"cell proliferation",
"cell viability assay",
"Child Behavior Checklist for Ages 1.5-5",
Expand Down
41 changes: 33 additions & 8 deletions registered-json-schemas/PortalDataset.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"calcium retention capacity assay",
"cell competition",
"cell count",
"cell painting",
"cell proliferation",
"cell viability assay",
"clinical data",
Expand Down Expand Up @@ -196,7 +197,10 @@
"items": {
"type": "string"
},
"type": "array"
"type": [
"array",
"null"
]
},
"creator": {
"type": "string"
Expand Down Expand Up @@ -250,7 +254,10 @@
"title": "dataType"
},
"description": {
"type": "string"
"type": [
"string",
"null"
]
},
"diseaseFocus": {
"items": {
Expand Down Expand Up @@ -333,11 +340,17 @@
"title": "ManifestationEnum",
"type": "string"
},
"type": "array",
"type": [
"array",
"null"
],
"title": "manifestation"
},
"series": {
"type": "string"
"type": [
"string",
"null"
]
},
"species": {
"items": {
Expand All @@ -358,7 +371,10 @@
"title": "SpeciesEnum",
"type": "string"
},
"type": "array",
"type": [
"array",
"null"
],
"title": "species"
},
"studyId": {
Expand All @@ -371,13 +387,22 @@
"items": {
"type": "string"
},
"type": "array"
"type": [
"array",
"null"
]
},
"yearProcessed": {
"type": "integer"
"type": [
"integer",
"null"
]
},
"yearPublished": {
"type": "integer"
"type": [
"integer",
"null"
]
}
},
"required": [
Expand Down
35 changes: 28 additions & 7 deletions registered-json-schemas/PortalStudy.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
"$id": "https://repo-prod.prod.sagebase.org/repo/v1/schema/type/registered/org.synapse.nf-portalstudy",
"properties": {
"accessRequirements": {
"type": "string"
"type": [
"string",
"null"
]
},
"acknowledgementStatements": {
"type": "string"
"type": [
"string",
"null"
]
},
"dataStatus": {
"description": "",
Expand Down Expand Up @@ -67,7 +73,10 @@
"title": "Data",
"type": "string"
},
"type": "array"
"type": [
"array",
"null"
]
},
"diseaseFocus": {
"items": {
Expand All @@ -85,7 +94,10 @@
"title": "DiseaseFocusEnum",
"type": "string"
},
"type": "array"
"type": [
"array",
"null"
]
},
"fundingAgency": {
"type": "string"
Expand All @@ -94,7 +106,10 @@
"items": {
"type": "string"
},
"type": "array"
"type": [
"array",
"null"
]
},
"initiative": {
"type": "string"
Expand Down Expand Up @@ -436,13 +451,19 @@
"items": {
"type": "string"
},
"type": "array"
"type": [
"array",
"null"
]
},
"relatedStudies": {
"items": {
"type": "string"
},
"type": "array"
"type": [
"array",
"null"
]
},
"studyFileviewId": {
"type": "string"
Expand Down
1 change: 1 addition & 0 deletions registered-json-schemas/Superdataset.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"CAPP-seq",
"cell competition",
"cell count",
"cell painting",
"cell proliferation",
"cell viability assay",
"Child Behavior Checklist for Ages 1.5-5",
Expand Down
10 changes: 5 additions & 5 deletions tests/validate/ScRNASeqTemplate_0.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Component,Filename,fileFormat,resourceType,dataType,dataSubtype,assay,individualID,species,sex,age,ageUnit,diagnosis,nf1Genotype,nf2Genotype,modelSystemName,parentSpecimenID,specimenID,aliquotID,tumorType,platform,nucleicAcidSource,specimenPreparationMethod,cellType,isCellLine,cellID,dissociationMethod,runType,libraryStrand,libraryPrep,libraryPreparationMethod,readPair,readLength,readDepth,targetDepth,batchID,auxiliaryAsset
ScRNASeqTemplate,a,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,A,Homo sapiens,,,,Neurofibromatosis type 1,,,,,A1,A1-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,Not Applicable,,10x,,,,,,
ScRNASeqTemplate,b,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,B,Homo sapiens,,,,Neurofibromatosis type 1,,,,,B2,B2-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,Not Applicable,,10x,,,,,,
ScRNASeqTemplate,c,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,C,Homo sapiens,,,,Neurofibromatosis type 1,,,,,C3,C3-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,Not Applicable,,10x,,,,,,
ScRNASeqTemplate,d,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,D,Homo sapiens,,,,Neurofibromatosis type 1,,,,,D4,D4-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,Not Applicable,,10x,,,,,,
Component,Filename,fileFormat,resourceType,dataType,dataSubtype,assay,individualID,species,sex,age,ageUnit,diagnosis,nf1Genotype,nf2Genotype,modelSystemName,parentSpecimenID,specimenID,aliquotID,tumorType,platform,nucleicAcidSource,specimenPreparationMethod,cellType,isCellLine,cellID,dissociationMethod,runType,libraryStrand,libraryPrep,libraryKitID,libraryPreparationMethod,readPair,readLength,readDepth,targetDepth,batchID,auxiliaryAsset
ScRNASeqTemplate,a,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,A,Homo sapiens,,,,Neurofibromatosis type 1,,,,,A1,A1-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,Not Applicable,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",10x,,,,,,
ScRNASeqTemplate,b,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,B,Homo sapiens,,,,Neurofibromatosis type 1,,,,,B2,B2-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,Not Applicable,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",10x,,,,,,
ScRNASeqTemplate,c,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,C,Homo sapiens,,,,Neurofibromatosis type 1,,,,,C3,C3-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,Not Applicable,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",10x,,,,,,
ScRNASeqTemplate,d,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,D,Homo sapiens,,,,Neurofibromatosis type 1,,,,,D4,D4-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,Not Applicable,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",10x,,,,,,
10 changes: 5 additions & 5 deletions tests/validate/ScRNASeqTemplate_1.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Component,Filename,fileFormat,resourceType,dataType,dataSubtype,assay,individualID,species,sex,age,ageUnit,diagnosis,nf1Genotype,nf2Genotype,modelSystemName,parentSpecimenID,specimenID,aliquotID,tumorType,platform,nucleicAcidSource,specimenPreparationMethod,cellType,isCellLine,cellID,dissociationMethod,runType,libraryStrand,libraryPrep,libraryPreparationMethod,readPair,readLength,readDepth,targetDepth,batchID,auxiliaryAsset
ScRNASeqTemplate,a,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,A,Homo sapiens,,,,Neurofibromatosis type 1,,,,,A1,A1-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,,,10x,,,,,,
ScRNASeqTemplate,b,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,B,Homo sapiens,,,,Neurofibromatosis type 1,,,,,B2,B2-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,,,10x,,,,,,
ScRNASeqTemplate,c,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,C,Homo sapiens,,,,Neurofibromatosis type 1,,,,,C3,C3-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,,,10x,,,,,,
ScRNASeqTemplate,d,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,D,Homo sapiens,,,,Neurofibromatosis type 1,,,,,D4,D4-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,,,10x,,,,,,
Component,Filename,fileFormat,resourceType,dataType,dataSubtype,assay,individualID,species,sex,age,ageUnit,diagnosis,nf1Genotype,nf2Genotype,modelSystemName,parentSpecimenID,specimenID,aliquotID,tumorType,platform,nucleicAcidSource,specimenPreparationMethod,cellType,isCellLine,cellID,dissociationMethod,runType,libraryStrand,libraryKitID,libraryPrep,libraryPreparationMethod,readPair,readLength,readDepth,targetDepth,batchID,auxiliaryAsset
ScRNASeqTemplate,a,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,A,Homo sapiens,,,,Neurofibromatosis type 1,,,,,A1,A1-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",,10x,,,,,,
ScRNASeqTemplate,b,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,B,Homo sapiens,,,,Neurofibromatosis type 1,,,,,B2,B2-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,oligodendrocyte,No,,enzymatic,,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",,10x,,,,,,
ScRNASeqTemplate,c,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,C,Homo sapiens,,,,Neurofibromatosis type 1,,,,,C3,C3-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",,10x,,,,,,
ScRNASeqTemplate,d,fastq,experimentalData,geneExpression,raw,single-cell RNA-seq,D,Homo sapiens,,,,Neurofibromatosis type 1,,,,,D4,D4-1,Low-Grade Glioma NOS,Illumina NextSeq 1000,single cell,Viably frozen,schwann,No,,enzymatic,,,"Chromium NextGEM Single Cell 3′ Reagent Kit, CG000204 Rev D (10X Genomics, Inc.)",,10x,,,,,,
Loading