Add missing info

all_valid_values.csv

@@ -7973,6 +7973,7 @@ dataset_file_format,COOL,
 dataset_file_format,CSV,
 dataset_file_format,DAE,
 dataset_file_format,DB,
+dataset_file_format,DCC,
 dataset_file_format,DS_Store,
 dataset_file_format,FASTA,
 dataset_file_format,FASTQ,
@@ -8579,6 +8580,7 @@ assay,SDS-PAGE,
 assay,Cell Fractionation,
 assay,Multiscale Light Sheet Microscopy,
 assay,Light Sheet Microscopy,
+assay,CODEX,
 tissue,Gonad,"Gonadal, Gonads"
 tissue,Abdominal Esophagus,"ESOPHAGUS, ABDOMINAL"
 tissue,Adipose Tissue,"Adipose, Body Fat, Fat Tissue, Human Adipose Tissue"
@@ -10787,17 +10789,18 @@ libraryStrategy,WCS,
 libraryStrategy,WGA,
 libraryStrategy,WGS,
 libraryStrategy,WXS,
-librarySource,Genomic,
-librarySource,Genomic Single Cell,
-librarySource,Metagenomic,
-librarySource,Single Nucleus,
-librarySource,Single Cell,
-librarySource,Metatranscriptomic,
-librarySource,Other,
-librarySource,Synthetic,
-librarySource,Transcriptomic,
-librarySource,Transcriptomic Single Cell,
-librarySource,Viral RNA,
+librarySourceMaterial,Bulk Cells,
+librarySourceMaterial,Bulk Tissue,
+librarySourceMaterial,Bulk Nuclei,
+librarySourceMaterial,Single-nuclei,
+librarySourceMaterial,Single-cells,
+librarySourceMaterial,Not Reported,
+librarySourceMolecule,Genomic DNA,
+librarySourceMolecule,Metagenomic,
+librarySourceMolecule,Metatranscriptomic,
+librarySourceMolecule,Not Reported,
+librarySourceMolecule,Transcriptome,
+librarySourceMolecule,Viral RNA,
 librarySelection,5-methylcytidine antibody,
 librarySelection,CAGE,
 librarySelection,rRNA Depletion,

json_schemas/mc2.DatasetView_TEMPLATE.schema.json → json_schemas/mc2.DatasetView-v10.0.0-schema.json

@@ -4,22 +4,22 @@
   "title": "DatasetView_validation",
   "type": "object",
   "properties": {
-    "Study Key": {
+    "StudyKey": {
       "type": "string",
       "title": "StudyKey",
       "description": "The unique Study_id foreign keys associated with the resource, found in the grant Study information. Used to group the resource with other components."
     },
-    "PublicationView Key": {
+    "PublicationViewKey": {
       "type": "string",
       "title": "PublicationViewKey",
       "description": "Unique PublicationView_id foreign key(s) that link metadata entries as part of the same collection."
     },
-    "GrantView Key": {
+    "GrantViewKey": {
       "type": "string",
       "title": "GrantViewKey",
       "description": "Unique GrantView_id foreign key(s) that group the resource with other components, as part of the same grant-associated collection."
     },
-    "Dataset File Formats": {
+    "DatasetFileFormats": {
       "type": "array",
       "items": {
         "enum": [
@@ -107,74 +107,37 @@
         ]
       }
     },
-    "Dataset Design": {
+    "DatasetDesign": {
       "type": "string",
       "title": "DatasetDesign",
       "description": "The overall design of the dataset.",
       "maxLength": 500
     },
-    "Dataset Name": {
-      "not": {
-        "type": "null"
-      },
+    "DatasetName": {
       "type": "string",
       "title": "DatasetName",
       "description": "Name of the dataset.",
       "maxLength": 250
     },
-    "Data Use Codes": {
+    "duoCodes": {
       "type": "array",
-      "title": "DataUseCodes",
-      "description": "DUO code - A data item that is used to indicate consent permissions for datasets and/or materials, and relates to the purposes for which datasets and/or material might be removed, stored or used. Available DUO code definitions can be found here: https://mc2-center.github.io/data-models/valid_values/file/#attribute-data-use-codes",
       "items": {
-        "enum": [
-          "US",
-          "NPU",
-          "PS",
-          "RS",
-          "CC",
-          "POA",
-          "PUB",
-          "TS",
-          "NPUNCU",
-          "DUM",
-          "NMDS",
-          "DS",
-          "GSO",
-          "IRB",
-          "IS",
-          "RTN",
-          "NPOA",
-          "HMB",
-          "COL",
-          "NCU",
-          "GS",
-          "MOR",
-          "NRES",
-          "GRU",
-          ""
-        ]
-      }
+        "type": "string"
+      },
+      "title": "duoCodes",
+      "description": "DUO code - A data item that is used to indicate consent permissions for datasets and/or materials, and relates to the purposes for which datasets and/or material might be removed, stored or used. Available DUO code definitions can be found here: https://mc2-center.github.io/data-models/valid_values/file/#attribute-data-use-codes"
     },
-    "Dataset Alias": {
+    "DatasetAlias": {
       "type": "string",
       "title": "DatasetAlias",
-      "description": "Alias of the dataset. Must be unique. Can be the GEO identifier such as GSE12345 or the dataset Synapse Id",
-      "not": {
-        "type": "null"
-      },
-      "minLength": 1
+      "description": "Alias of the dataset. Must be unique. Can be the GEO identifier such as GSE12345 or the dataset Synapse Id"
     },
-    "Dataset Url": {
+    "DatasetUrl": {
       "type": "string",
       "title": "DatasetUrl",
-      "description": "The url of where the dataset is stored.",
-      "not": {
-        "type": "null"
-      },
-      "minLength": 1
+      "description": "The url of where the dataset is stored."
     },
-    "Dataset Assay": {
+    "DatasetAssay": {
       "type": "array",
       "title": "DatasetAssay",
       "description": "The assay(s) the dataset is representative of.",
@@ -562,7 +525,7 @@
         ]
       }
     },
-    "Dataset Description": {
+    "DatasetDescription": {
       "type": "string",
       "title": "DatasetDescription",
       "description": "Text description of the dataset.",
@@ -571,13 +534,9 @@
     "DatasetView_id": {
       "type": "string",
       "title": "DatasetViewid",
-      "description": "A unique primary key that enables record updates using schematic",
-      "not": {
-        "type": "null"
-      },
-      "minLength": 1
+      "description": "A unique primary key that enables record updates using schematic"
     },
-    "Dataset Species": {
+    "DatasetSpecies": {
       "type": "array",
       "title": "DatasetSpecies",
       "description": "The species the data was collected on.",
@@ -614,7 +573,7 @@
         ]
       }
     },
-    "Dataset Tumor Type": {
+    "DatasetTumorType": {
       "type": "array",
       "title": "DatasetTumorType",
       "description": "The tumor type(s), if applicable, of the data collected on",
@@ -810,7 +769,7 @@
         ]
       }
     },
-    "Dataset Tissue": {
+    "DatasetTissue": {
       "type": "array",
       "title": "DatasetTissue",
       "description": "Tissue type(s) associated with the dataset",
@@ -937,30 +896,12 @@
     "Component": {
       "type": "string",
       "title": "Component",
-      "description": "Type of metadata associated with this entity.",
-      "not": {
-        "type": "null"
-      },
-      "minLength": 1
+      "description": "Type of metadata associated with this entity."
     },
-    "Dataset Doi":{
+    "DatasetDoi":{
       "type": "string",
       "title": "DatasetDoi",
-      "description": "The Digital Object Identifier (DOI) associated with the dataset.",
-      "not": {
-        "type": "null"
-      },
-      "minLength": 1
+      "description": "The Digital Object Identifier (DOI) associated with the dataset."
     }
-  },
-  "required": [
-    "Dataset Name",
-    "Dataset Alias",
-    "Dataset Url",
-    "Dataset Assay",
-    "DatasetView_id",
-    "Dataset Species",
-    "Component",
-    "Dataset Doi"
-  ]
+  }
 }