From 776a88886e9dd2ff39a8b4c071b63557cf7406cf Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:59:08 -0400 Subject: [PATCH 01/20] Update submitAnimalModel.json remove required developer name --- NF-Tools-Schemas/animal-model/submitAnimalModel.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/NF-Tools-Schemas/animal-model/submitAnimalModel.json b/NF-Tools-Schemas/animal-model/submitAnimalModel.json index 81035f0..3cf4e72 100644 --- a/NF-Tools-Schemas/animal-model/submitAnimalModel.json +++ b/NF-Tools-Schemas/animal-model/submitAnimalModel.json @@ -242,11 +242,7 @@ } } } - }, - "required": [ - "userInfo.developerName", - "userInfo.developerAffiliation" - ] + } } }, { @@ -320,4 +316,4 @@ } } ] - } \ No newline at end of file + } From 43f4f6e7063cdf1734e9e289ff8468b4a74d4010 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:07:19 +0000 Subject: [PATCH 02/20] push antibody --- .../antibody/SubmitAntibodyUiSchema.json | 21 ++ NF-Tools-Schemas/antibody/submitAntibody.json | 289 ++++++++++++++++++ 2 files changed, 310 insertions(+) create mode 100644 NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json create mode 100644 NF-Tools-Schemas/antibody/submitAntibody.json diff --git a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json new file mode 100644 index 0000000..9924550 --- /dev/null +++ b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json @@ -0,0 +1,21 @@ +{ + "description": { + "ui:widget": "textarea", + "ui:placeholder": "Provide a brief description (~20 words)", + "ui:options": { + "rows": 3 + } + }, + "basicInfo": { + "species": { + "ui:widget": "radio", + "ui:inline": "true" + } + }, + "reactiveSpecies": { + "ui:widget": "select" + }, + "hostOrganism": { + "ui:widget": "radio" + } +} \ No newline at end of file diff --git a/NF-Tools-Schemas/antibody/submitAntibody.json b/NF-Tools-Schemas/antibody/submitAntibody.json new file mode 100644 index 0000000..85c4b46 --- /dev/null +++ b/NF-Tools-Schemas/antibody/submitAntibody.json @@ -0,0 +1,289 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "Submit Antibody", + "type": "object", + "properties": { + "userInfo": { + "type": "object", + "title": "Your Information", + "properties": { + "firstandlastName": { + "type": "string", + "title": "First and Last Name" + }, + "email": { + "type": "string", + "title": "Contact Email", + "format": "email" + }, + "institution": { + "type": "string", + "title": "Institution/Affiliation", + "default": "" + }, + "isDeveloper": { + "type": "string", + "title": "Are you the developer?", + "enum": [ + "Yes", + "No" + ], + "default": "Yes" + } + }, + "required": ["firstandlastName", "email", "isDeveloper"] + }, + "basicInfo": { + "type": "object", + "title": "", + "properties": { + "antibodyName": { + "type": "string", + "title": "Name of Antibody" + }, + "synonyms": { + "type": "string", + "title": "Synonyms" + }, + "description": { + "type": "string", + "title": "Description (~20 words)" + }, + "reactiveSpecies": { + "type": "object", + "title": "Reactive Species", + "properties": { + "Human": { + "type": "boolean" + }, + "Mouse": { + "type": "boolean" + }, + "Rat": { + "type": "boolean" + }, + "Chicken": { + "type": "boolean" + }, + "Rabbit": { + "type": "boolean" + }, + "Pig": { + "type": "boolean" + }, + "Dog": { + "type": "boolean" + }, + "Zebrafish": { + "type": "boolean" + }, + "Fish": { + "type": "boolean" + }, + "Non-humanprimate": { + "type": "boolean" + }, + "GuineaPig": { + "type": "boolean" + }, + "Hamster": { + "type": "boolean" + }, + "Cow": { + "type": "boolean" + }, + "Monkey": { + "type": "boolean" + }, + "Avian": { + "type": "boolean" + }, + "Horse": { + "type": "boolean" + }, + "Rodent": { + "type": "boolean" + }, + "Drosophila": { + "type": "boolean" + }, + "Unknown": { + "type": "boolean" + } + } + } + }, + "required": ["animalModelName", "description", "reactiveSpecies"] + }, + "hostOrganism": { + "type": "string", + "title": "Host Organism", + "enum": [ + "Mouse", + "Rabit", + "Unknown" + ] + }, + "Conjugated": { + "type": "string", + "title": "Conjugated", + "enum": [ + "Yes", + "Non-conjugated" + ] + }, + "targetAntigen": { + "type": "string", + "title": "Target Antigen" + }, + "clonality": { + "type": "object", + "title": "Clonality", + "properties": { + "Monoclonal": { + "type": "boolean" + }, + "Polyclonal": { + "type": "boolean" + }, + "Secondary": { + "type": "boolean" + }, + "Recombinant": { + "type": "boolean" + }, + "Control": { + "type": "boolean" + }, + "Cocktail": { + "type": "boolean" + }, + "Isotope Control": { + "type": "boolean" + }, + "Unknown": { + "type": "boolean" + } + } + }, + "publicationDOI": { + "type": "string", + "title": "Publication Link (DOI)" + }, + "itemAcquisition": { + "type": "string", + "title": "How to acquire", + "enum": [ + "Contact Developer", + "Purchase from Vendor", + "Other" + ], + "default": "Contact Developer" + } + }, + "allOf": [ + { + "if": { + "properties": { + "userInfo": { + "properties": { + "isDeveloper": { + "const": "No" + } + } + } + } + }, + "then": { + "properties": { + "userInfo": { + "properties": { + "developerName": { + "type": "string", + "title": "Developer Name" + }, + "developerAffiliation": { + "type": "string", + "title": "Developer Affiliation" + } + } + } + }, + "required": [ + "userInfo.developerName", + "userInfo.developerAffiliation" + ] + } + }, + { + "if": { + "properties": { + "basicInfo": { + "properties": { + "species": { + "const": "Other" + } + } + } + } + }, + "then": { + "properties": { + "basicInfo": { + "properties": { + "otherSpecies": { + "type": "string", + "title": "Other species name" + } + } + } + } + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Purchase from Vendor" + } + } + }, + "then": { + "properties": { + "vendor": { + "type": "string", + "title": "Vendor Name" + }, + "catalogNumber": { + "type": "string", + "title": "Catalog Number" + }, + "catalogURL": { + "type": "string", + "title": "Link to vendor page" + } + } + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Other" + } + } + }, + "then": { + "properties": { + "additionalDetails": { + "type": "string", + "title": "Please provide additional details." + } + }, + "required": [ + "additionalDetails" + ] + } + } + ] + } \ No newline at end of file From 06e5198e91662cd1cdf18305fcfc7c4065c5fca0 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:14:57 +0000 Subject: [PATCH 03/20] inline --- NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json index 9924550..079885c 100644 --- a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json +++ b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json @@ -12,10 +12,11 @@ "ui:inline": "true" } }, - "reactiveSpecies": { - "ui:widget": "select" - }, "hostOrganism": { "ui:widget": "radio" + }, + "reactiveSpecies": { + "ui:widget": "select", + "ui:inline": "true" } } \ No newline at end of file From 24f4911f14e7a9eaf42e82d37cad0ed1e6da9633 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:18:36 +0000 Subject: [PATCH 04/20] reorder --- .../antibody/SubmitAntibodyUiSchema.json | 14 +- NF-Tools-Schemas/antibody/submitAntibody.json | 133 ++++++++++-------- 2 files changed, 78 insertions(+), 69 deletions(-) diff --git a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json index 079885c..08d39b3 100644 --- a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json +++ b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json @@ -10,13 +10,13 @@ "species": { "ui:widget": "radio", "ui:inline": "true" - } - }, - "hostOrganism": { - "ui:widget": "radio" - }, - "reactiveSpecies": { - "ui:widget": "select", + }, + "hostOrganism": { + "ui:widget": "radio" + }, + "reactiveSpecies": { + "ui:widget": "select", "ui:inline": "true" + } } } \ No newline at end of file diff --git a/NF-Tools-Schemas/antibody/submitAntibody.json b/NF-Tools-Schemas/antibody/submitAntibody.json index 85c4b46..9d01fa9 100644 --- a/NF-Tools-Schemas/antibody/submitAntibody.json +++ b/NF-Tools-Schemas/antibody/submitAntibody.json @@ -31,7 +31,11 @@ "default": "Yes" } }, - "required": ["firstandlastName", "email", "isDeveloper"] + "required": [ + "firstandlastName", + "email", + "isDeveloper" + ] }, "basicInfo": { "type": "object", @@ -49,6 +53,15 @@ "type": "string", "title": "Description (~20 words)" }, + "hostOrganism": { + "type": "string", + "title": "Host Organism", + "enum": [ + "Mouse", + "Rabit", + "Unknown" + ] + }, "reactiveSpecies": { "type": "object", "title": "Reactive Species", @@ -113,18 +126,14 @@ } } }, - "required": ["animalModelName", "description", "reactiveSpecies"] - }, - "hostOrganism": { - "type": "string", - "title": "Host Organism", - "enum": [ - "Mouse", - "Rabit", - "Unknown" + "required": [ + "animalModelName", + "description", + "hostOrganism", + "reactiveSpecies" ] }, - "Conjugated": { + "conjugated": { "type": "string", "title": "Conjugated", "enum": [ @@ -227,63 +236,63 @@ } } }, - "then": { - "properties": { - "basicInfo": { - "properties": { - "otherSpecies": { - "type": "string", - "title": "Other species name" - } + "then": { + "properties": { + "basicInfo": { + "properties": { + "otherSpecies": { + "type": "string", + "title": "Other species name" } } } } + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Purchase from Vendor" + } + } }, - { - "if": { - "properties": { - "itemAcquisition": { - "const": "Purchase from Vendor" - } - } + "then": { + "properties": { + "vendor": { + "type": "string", + "title": "Vendor Name" }, - "then": { - "properties": { - "vendor": { - "type": "string", - "title": "Vendor Name" - }, - "catalogNumber": { - "type": "string", - "title": "Catalog Number" - }, - "catalogURL": { - "type": "string", - "title": "Link to vendor page" - } - } - } - }, - { - "if": { - "properties": { - "itemAcquisition": { - "const": "Other" - } - } + "catalogNumber": { + "type": "string", + "title": "Catalog Number" }, - "then": { - "properties": { - "additionalDetails": { - "type": "string", - "title": "Please provide additional details." - } - }, - "required": [ - "additionalDetails" - ] + "catalogURL": { + "type": "string", + "title": "Link to vendor page" } } - ] - } \ No newline at end of file + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Other" + } + } + }, + "then": { + "properties": { + "additionalDetails": { + "type": "string", + "title": "Please provide additional details." + } + }, + "required": [ + "additionalDetails" + ] + } + } + ] +} \ No newline at end of file From 68f61c5703512c351349ddb934ba9a7f65a55771 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:22:01 +0000 Subject: [PATCH 05/20] reorder --- .../antibody/SubmitAntibodyUiSchema.json | 19 ++++++-------- NF-Tools-Schemas/antibody/submitAntibody.json | 25 ------------------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json index 08d39b3..cb0e9a0 100644 --- a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json +++ b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json @@ -1,18 +1,15 @@ { - "description": { - "ui:widget": "textarea", - "ui:placeholder": "Provide a brief description (~20 words)", - "ui:options": { - "rows": 3 - } - }, "basicInfo": { - "species": { - "ui:widget": "radio", - "ui:inline": "true" + "description": { + "ui:widget": "textarea", + "ui:placeholder": "Provide a brief description (~20 words)", + "ui:options": { + "rows": 3 + } }, "hostOrganism": { - "ui:widget": "radio" + "ui:widget": "radio", + "ui:inline": "true" }, "reactiveSpecies": { "ui:widget": "select", diff --git a/NF-Tools-Schemas/antibody/submitAntibody.json b/NF-Tools-Schemas/antibody/submitAntibody.json index 9d01fa9..f604694 100644 --- a/NF-Tools-Schemas/antibody/submitAntibody.json +++ b/NF-Tools-Schemas/antibody/submitAntibody.json @@ -224,31 +224,6 @@ ] } }, - { - "if": { - "properties": { - "basicInfo": { - "properties": { - "species": { - "const": "Other" - } - } - } - } - }, - "then": { - "properties": { - "basicInfo": { - "properties": { - "otherSpecies": { - "type": "string", - "title": "Other species name" - } - } - } - } - } - }, { "if": { "properties": { From c0e48039b8f03497a9ed9294c087c2523de695b9 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:23:19 +0000 Subject: [PATCH 06/20] fix required --- NF-Tools-Schemas/antibody/submitAntibody.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NF-Tools-Schemas/antibody/submitAntibody.json b/NF-Tools-Schemas/antibody/submitAntibody.json index f604694..4c524f9 100644 --- a/NF-Tools-Schemas/antibody/submitAntibody.json +++ b/NF-Tools-Schemas/antibody/submitAntibody.json @@ -127,7 +127,7 @@ } }, "required": [ - "animalModelName", + "antibodyName", "description", "hostOrganism", "reactiveSpecies" From 08a6c204fd4258ca24fb4cdeb22b6f0d65dba41d Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:32:43 +0000 Subject: [PATCH 07/20] edit description and clonality --- .../antibody/SubmitAntibodyUiSchema.json | 6 ++- NF-Tools-Schemas/antibody/submitAntibody.json | 38 ++++++------------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json index cb0e9a0..caa571f 100644 --- a/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json +++ b/NF-Tools-Schemas/antibody/SubmitAntibodyUiSchema.json @@ -4,7 +4,7 @@ "ui:widget": "textarea", "ui:placeholder": "Provide a brief description (~20 words)", "ui:options": { - "rows": 3 + "rows": 5 } }, "hostOrganism": { @@ -14,6 +14,10 @@ "reactiveSpecies": { "ui:widget": "select", "ui:inline": "true" + }, + "clonality": { + "ui:widget": "select", + "ui:inline": "true" } } } \ No newline at end of file diff --git a/NF-Tools-Schemas/antibody/submitAntibody.json b/NF-Tools-Schemas/antibody/submitAntibody.json index 4c524f9..1167e92 100644 --- a/NF-Tools-Schemas/antibody/submitAntibody.json +++ b/NF-Tools-Schemas/antibody/submitAntibody.json @@ -146,34 +146,18 @@ "title": "Target Antigen" }, "clonality": { - "type": "object", + "type": "string", "title": "Clonality", - "properties": { - "Monoclonal": { - "type": "boolean" - }, - "Polyclonal": { - "type": "boolean" - }, - "Secondary": { - "type": "boolean" - }, - "Recombinant": { - "type": "boolean" - }, - "Control": { - "type": "boolean" - }, - "Cocktail": { - "type": "boolean" - }, - "Isotope Control": { - "type": "boolean" - }, - "Unknown": { - "type": "boolean" - } - } + "enum": [ + "Monoclonal", + "Polyclonal", + "Secondary", + "Recombinant", + "Control", + "Cocktail", + "Isotope Control", + "Unknown" + ] }, "publicationDOI": { "type": "string", From 82dac718d377463b93ee0b001bbedb51601e4dd5 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:56:19 +0000 Subject: [PATCH 08/20] add cell line --- NF-Tools-Schemas/antibody/submitAntibody.json | 6 +- .../cell-line/submitCellLine.json | 239 ++++++++++++++++++ .../cell-line/submitCellLineUiSchema.json | 11 + 3 files changed, 251 insertions(+), 5 deletions(-) create mode 100644 NF-Tools-Schemas/cell-line/submitCellLine.json create mode 100644 NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json diff --git a/NF-Tools-Schemas/antibody/submitAntibody.json b/NF-Tools-Schemas/antibody/submitAntibody.json index 1167e92..ee59309 100644 --- a/NF-Tools-Schemas/antibody/submitAntibody.json +++ b/NF-Tools-Schemas/antibody/submitAntibody.json @@ -201,11 +201,7 @@ } } } - }, - "required": [ - "userInfo.developerName", - "userInfo.developerAffiliation" - ] + } } }, { diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json new file mode 100644 index 0000000..d5cc559 --- /dev/null +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -0,0 +1,239 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "Submit Cell Line", + "type": "object", + "properties": { + "userInfo": { + "type": "object", + "title": "Your Information", + "properties": { + "firstandlastName": { + "type": "string", + "title": "First and Last Name" + }, + "email": { + "type": "string", + "title": "Contact Email", + "format": "email" + }, + "institution": { + "type": "string", + "title": "Institution/Affiliation", + "default": "" + }, + "isDeveloper": { + "type": "string", + "title": "Are you the developer?", + "enum": [ + "Yes", + "No" + ], + "default": "Yes" + } + }, + "required": [ + "firstandlastName", + "email", + "isDeveloper" + ] + }, + "basicInfo": { + "type": "object", + "title": "", + "properties": { + "cellLineName": { + "type": "string", + "title": "Name of Cell Line" + }, + "synonyms": { + "type": "string", + "title": "Synonyms" + }, + "description": { + "type": "string", + "title": "Description (~20 words)" + }, + "species": { + "type": "string", + "title": "Species", + "enum": [ + "Human", + "Mouse", + "Dog", + "Chinese Hamster", + "E. Coli" + ] + }, + "sex": { + "type": "string", + "title": "Sex", + "enum": [ + "Male", + "Female", + "Unkown" + ] + }, + "race": { + "type": "string", + "title": "Race", + "enum": [ + "American Indian or Alaska Native", + "Asian", + "Black or African American", + "Native Hawaiian or Other Pacific Islander", + "White", + "Hispanic or Latino", + "Middle Eastern or North African", + "Multiracial", + "Other", + "Not specified" + ] + }, + "age": { + "type": "string", + "title": "Age" + } + }, + "required": [ + "cellLineName", + "description", + "species" + ] + }, + "category": { + "type": "string", + "title": "Cell Line Category", + "enum": [ + "Cancer cell line", + "Embryonic stem cell", + "Finite cell line", + "Hybrid cell line", + "Hybridoma" + ] + }, + "cellLineGeneticDisorder": { + "type": "string", + "title": "Genetic Disorder", + "enum": [ + "Neurofibromatosis Type 1", + "Neurofibromatosis Type 2", + "Schwannamatosis", + "None" + ] + }, + "tissue": { + "type": "string", + "title": "Tissue Type", + "enum": [ + "Blood", + "Bone Marrow", + "Buccal Mucosa", + "Buffy Coat", + "Cerebral Cortex", + "Dorsal Root Ganglion", + "Embryonic Tissue", + "Meninges", + "Nerve Tissue", + "Optic Nerve", + "Plasma", + "Primary Tumor", + "Sciatic Nerve", + "Serum", + "Splenocyte", + "Unspecified", + "Urine", + "Whole Brain" + ] + }, + "publicationDOI": { + "type": "string", + "title": "Publication Link (DOI)" + }, + "itemAcquisition": { + "type": "string", + "title": "How to acquire", + "enum": [ + "Contact Developer", + "Purchase from Vendor", + "Other" + ], + "default": "Contact Developer" + } + }, + "allOf": [ + { + "if": { + "properties": { + "userInfo": { + "properties": { + "isDeveloper": { + "const": "No" + } + } + } + } + }, + "then": { + "properties": { + "userInfo": { + "properties": { + "developerName": { + "type": "string", + "title": "Developer Name" + }, + "developerAffiliation": { + "type": "string", + "title": "Developer Affiliation" + } + } + } + } + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Purchase from Vendor" + } + } + }, + "then": { + "properties": { + "vendor": { + "type": "string", + "title": "Vendor Name" + }, + "catalogNumber": { + "type": "string", + "title": "Catalog Number" + }, + "catalogURL": { + "type": "string", + "title": "Link to vendor page" + } + } + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Other" + } + } + }, + "then": { + "properties": { + "additionalDetails": { + "type": "string", + "title": "Please provide additional details." + } + }, + "required": [ + "additionalDetails" + ] + } + } + ] +} \ No newline at end of file diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json new file mode 100644 index 0000000..ea99828 --- /dev/null +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -0,0 +1,11 @@ +{ + "basicInfo": { + "description": { + "ui:widget": "textarea", + "ui:placeholder": "Provide a brief description (~20 words)", + "ui:options": { + "rows": 5 + } + } + } +} \ No newline at end of file From ddd5e9b5b514730aea46caf2de31af72be85b169 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:06:56 +0000 Subject: [PATCH 09/20] edit cell line --- .../cell-line/submitCellLine.json | 70 +++++++++++++++++++ .../cell-line/submitCellLineUiSchema.json | 6 ++ 2 files changed, 76 insertions(+) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index d5cc559..6641ae8 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -121,6 +121,72 @@ "None" ] }, + "cellLineManifestation": { + "type": "string", + "title": "Manifestation", + "enum": [ + "Acute Lymphocytic Leukemia", + "Adult T Acute Lymphoblastic Leukemia", + "Amelanotic Cutaneous Melanoma", + "Askin Tumor", + "Astrocytoma", + "Atypical", + "BRCA2 Syndrome", + "BCR-ABL1 positive", + "Cafe-Au-Lait Spots", + "Canine Histiocytic Sarcoma", + "Canine Lymphoma", + "Canine Melanoma", + "Canine Soft Tissue Sarcoma", + "Cecum Adenocarcinoma", + "Cervical Adenocarcinoma", + "Chronic Myelogenous Leukemia", + "Clinically Affected", + "Clinically Asymptomatic (Self-reported)", + "Clinically Asymptomatic But At Risk", + "Colon Adenocarcinoma", + "Colon Carcinoma", + "Cutaneous Melanoma", + "Cutaneous Neurofibroma", + "Cystic Fibrosis", + "General NF1 Deficiency", + "Glioblastoma", + "Hereditary Breast and Ovarian Cancer Syndrome", + "Human Papillomavirus-Related Endocervical Adenocarcinoma", + "Invasive Breast Carcinoma", + "Lipoma", + "Lung Adenocarcinoma", + "Lung Adenosquamous Carcinoma", + "Lung Carcinoid Tumor", + "Lung Giant Cell Carcinoma", + "Lung Large Cell Carcinoma", + "Lung Non-Small Cell Carcinoma", + "Lung Papillary Adenocarcinoma", + "Lung Small Cell Carcinoma", + "Lung Squamous Cell Carcinoma", + "Malignant Peripheral Nerve Sheath Tumor", + "Melanoma", + "Minimally Invasive Lung Adenocarcinoma", + "Mouse Adrenal Gland Pheochromocytoma", + "Neuroblastoma", + "Neurofibroma", + "Noonan Syndrome", + "Ovarian Cystadenocarcinoma", + "Pancreatic Adenocarcinoma", + "Pancreatic Adenosquamous Carcinoma", + "Pancreatic Carcinoma", + "Pancreatic Ductal Adenocarcinoma", + "Pancreatic Somatostatinoma", + "Plexiform Neurofibroma", + "Pleural Malignant Mesothelioma", + "Poorly Differentiated Thyroid Gland Carcinoma", + "Rectal Adenocarcinoma", + "Schwannoma", + "Thyroid Gland Anaplastic Carcinoma", + "Thyroid Gland Follicular Carcinoma", + "Unaffected Nerve" + ] + }, "tissue": { "type": "string", "title": "Tissue Type", @@ -145,6 +211,10 @@ "Whole Brain" ] }, + "populationDoublingTime": { + "type": "number", + "title": "Population Doubling Time (in hours)" + }, "publicationDOI": { "type": "string", "title": "Publication Link (DOI)" diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json index ea99828..d6f72af 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -7,5 +7,11 @@ "rows": 5 } } + }, + "cellLineManifestation": { + "ui:widget": "select", + "ui:options": { + "multiple": true + } } } \ No newline at end of file From 447c4b678b84e533bab69273e3b54cddcc80f8c4 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:09:33 +0000 Subject: [PATCH 10/20] changetoarray --- NF-Tools-Schemas/cell-line/submitCellLine.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index 6641ae8..9edc3ff 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -122,7 +122,7 @@ ] }, "cellLineManifestation": { - "type": "string", + "type": "array", "title": "Manifestation", "enum": [ "Acute Lymphocytic Leukemia", From 7dce2aaac1b9fb9b77666f078a6f8b2f7d4b3548 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:12:12 +0000 Subject: [PATCH 11/20] small change --- .../cell-line/submitCellLine.json | 129 +++++++++--------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index 9edc3ff..44647ee 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -123,69 +123,72 @@ }, "cellLineManifestation": { "type": "array", - "title": "Manifestation", - "enum": [ - "Acute Lymphocytic Leukemia", - "Adult T Acute Lymphoblastic Leukemia", - "Amelanotic Cutaneous Melanoma", - "Askin Tumor", - "Astrocytoma", - "Atypical", - "BRCA2 Syndrome", - "BCR-ABL1 positive", - "Cafe-Au-Lait Spots", - "Canine Histiocytic Sarcoma", - "Canine Lymphoma", - "Canine Melanoma", - "Canine Soft Tissue Sarcoma", - "Cecum Adenocarcinoma", - "Cervical Adenocarcinoma", - "Chronic Myelogenous Leukemia", - "Clinically Affected", - "Clinically Asymptomatic (Self-reported)", - "Clinically Asymptomatic But At Risk", - "Colon Adenocarcinoma", - "Colon Carcinoma", - "Cutaneous Melanoma", - "Cutaneous Neurofibroma", - "Cystic Fibrosis", - "General NF1 Deficiency", - "Glioblastoma", - "Hereditary Breast and Ovarian Cancer Syndrome", - "Human Papillomavirus-Related Endocervical Adenocarcinoma", - "Invasive Breast Carcinoma", - "Lipoma", - "Lung Adenocarcinoma", - "Lung Adenosquamous Carcinoma", - "Lung Carcinoid Tumor", - "Lung Giant Cell Carcinoma", - "Lung Large Cell Carcinoma", - "Lung Non-Small Cell Carcinoma", - "Lung Papillary Adenocarcinoma", - "Lung Small Cell Carcinoma", - "Lung Squamous Cell Carcinoma", - "Malignant Peripheral Nerve Sheath Tumor", - "Melanoma", - "Minimally Invasive Lung Adenocarcinoma", - "Mouse Adrenal Gland Pheochromocytoma", - "Neuroblastoma", - "Neurofibroma", - "Noonan Syndrome", - "Ovarian Cystadenocarcinoma", - "Pancreatic Adenocarcinoma", - "Pancreatic Adenosquamous Carcinoma", - "Pancreatic Carcinoma", - "Pancreatic Ductal Adenocarcinoma", - "Pancreatic Somatostatinoma", - "Plexiform Neurofibroma", - "Pleural Malignant Mesothelioma", - "Poorly Differentiated Thyroid Gland Carcinoma", - "Rectal Adenocarcinoma", - "Schwannoma", - "Thyroid Gland Anaplastic Carcinoma", - "Thyroid Gland Follicular Carcinoma", - "Unaffected Nerve" - ] + "title": "Cell Line Manifestation", + "items": { + "type": "string", + "enum": [ + "Acute Lymphocytic Leukemia", + "Adult T Acute Lymphoblastic Leukemia", + "Amelanotic Cutaneous Melanoma", + "Askin Tumor", + "Astrocytoma", + "Atypical", + "BRCA2 Syndrome", + "BCR-ABL1 positive", + "Cafe-Au-Lait Spots", + "Canine Histiocytic Sarcoma", + "Canine Lymphoma", + "Canine Melanoma", + "Canine Soft Tissue Sarcoma", + "Cecum Adenocarcinoma", + "Cervical Adenocarcinoma", + "Chronic Myelogenous Leukemia", + "Clinically Affected", + "Clinically Asymptomatic (Self-reported)", + "Clinically Asymptomatic But At Risk", + "Colon Adenocarcinoma", + "Colon Carcinoma", + "Cutaneous Melanoma", + "Cutaneous Neurofibroma", + "Cystic Fibrosis", + "General NF1 Deficiency", + "Glioblastoma", + "Hereditary Breast and Ovarian Cancer Syndrome", + "Human Papillomavirus-Related Endocervical Adenocarcinoma", + "Invasive Breast Carcinoma", + "Lipoma", + "Lung Adenocarcinoma", + "Lung Adenosquamous Carcinoma", + "Lung Carcinoid Tumor", + "Lung Giant Cell Carcinoma", + "Lung Large Cell Carcinoma", + "Lung Non-Small Cell Carcinoma", + "Lung Papillary Adenocarcinoma", + "Lung Small Cell Carcinoma", + "Lung Squamous Cell Carcinoma", + "Malignant Peripheral Nerve Sheath Tumor", + "Melanoma", + "Minimally Invasive Lung Adenocarcinoma", + "Mouse Adrenal Gland Pheochromocytoma", + "Neuroblastoma", + "Neurofibroma", + "Noonan Syndrome", + "Ovarian Cystadenocarcinoma", + "Pancreatic Adenocarcinoma", + "Pancreatic Adenosquamous Carcinoma", + "Pancreatic Carcinoma", + "Pancreatic Ductal Adenocarcinoma", + "Pancreatic Somatostatinoma", + "Plexiform Neurofibroma", + "Pleural Malignant Mesothelioma", + "Poorly Differentiated Thyroid Gland Carcinoma", + "Rectal Adenocarcinoma", + "Schwannoma", + "Thyroid Gland Anaplastic Carcinoma", + "Thyroid Gland Follicular Carcinoma", + "Unaffected Nerve" + ] + } }, "tissue": { "type": "string", From df931d830b69ff1d011672e1b75d8c46afaad1aa Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:18:38 +0000 Subject: [PATCH 12/20] checkbox test --- .../cell-line/submitCellLine.json | 330 +++++++++--------- .../cell-line/submitCellLineUiSchema.json | 2 +- 2 files changed, 165 insertions(+), 167 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index 44647ee..c4039a6 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -124,189 +124,187 @@ "cellLineManifestation": { "type": "array", "title": "Cell Line Manifestation", - "items": { - "type": "string", - "enum": [ - "Acute Lymphocytic Leukemia", - "Adult T Acute Lymphoblastic Leukemia", - "Amelanotic Cutaneous Melanoma", - "Askin Tumor", - "Astrocytoma", - "Atypical", - "BRCA2 Syndrome", - "BCR-ABL1 positive", - "Cafe-Au-Lait Spots", - "Canine Histiocytic Sarcoma", - "Canine Lymphoma", - "Canine Melanoma", - "Canine Soft Tissue Sarcoma", - "Cecum Adenocarcinoma", - "Cervical Adenocarcinoma", - "Chronic Myelogenous Leukemia", - "Clinically Affected", - "Clinically Asymptomatic (Self-reported)", - "Clinically Asymptomatic But At Risk", - "Colon Adenocarcinoma", - "Colon Carcinoma", - "Cutaneous Melanoma", - "Cutaneous Neurofibroma", - "Cystic Fibrosis", - "General NF1 Deficiency", - "Glioblastoma", - "Hereditary Breast and Ovarian Cancer Syndrome", - "Human Papillomavirus-Related Endocervical Adenocarcinoma", - "Invasive Breast Carcinoma", - "Lipoma", - "Lung Adenocarcinoma", - "Lung Adenosquamous Carcinoma", - "Lung Carcinoid Tumor", - "Lung Giant Cell Carcinoma", - "Lung Large Cell Carcinoma", - "Lung Non-Small Cell Carcinoma", - "Lung Papillary Adenocarcinoma", - "Lung Small Cell Carcinoma", - "Lung Squamous Cell Carcinoma", - "Malignant Peripheral Nerve Sheath Tumor", - "Melanoma", - "Minimally Invasive Lung Adenocarcinoma", - "Mouse Adrenal Gland Pheochromocytoma", - "Neuroblastoma", - "Neurofibroma", - "Noonan Syndrome", - "Ovarian Cystadenocarcinoma", - "Pancreatic Adenocarcinoma", - "Pancreatic Adenosquamous Carcinoma", - "Pancreatic Carcinoma", - "Pancreatic Ductal Adenocarcinoma", - "Pancreatic Somatostatinoma", - "Plexiform Neurofibroma", - "Pleural Malignant Mesothelioma", - "Poorly Differentiated Thyroid Gland Carcinoma", - "Rectal Adenocarcinoma", - "Schwannoma", - "Thyroid Gland Anaplastic Carcinoma", - "Thyroid Gland Follicular Carcinoma", - "Unaffected Nerve" - ] - } - }, - "tissue": { - "type": "string", - "title": "Tissue Type", "enum": [ - "Blood", - "Bone Marrow", - "Buccal Mucosa", - "Buffy Coat", - "Cerebral Cortex", - "Dorsal Root Ganglion", - "Embryonic Tissue", - "Meninges", - "Nerve Tissue", - "Optic Nerve", - "Plasma", - "Primary Tumor", - "Sciatic Nerve", - "Serum", - "Splenocyte", - "Unspecified", - "Urine", - "Whole Brain" + "Acute Lymphocytic Leukemia", + "Adult T Acute Lymphoblastic Leukemia", + "Amelanotic Cutaneous Melanoma", + "Askin Tumor", + "Astrocytoma", + "Atypical", + "BRCA2 Syndrome", + "BCR-ABL1 positive", + "Cafe-Au-Lait Spots", + "Canine Histiocytic Sarcoma", + "Canine Lymphoma", + "Canine Melanoma", + "Canine Soft Tissue Sarcoma", + "Cecum Adenocarcinoma", + "Cervical Adenocarcinoma", + "Chronic Myelogenous Leukemia", + "Clinically Affected", + "Clinically Asymptomatic (Self-reported)", + "Clinically Asymptomatic But At Risk", + "Colon Adenocarcinoma", + "Colon Carcinoma", + "Cutaneous Melanoma", + "Cutaneous Neurofibroma", + "Cystic Fibrosis", + "General NF1 Deficiency", + "Glioblastoma", + "Hereditary Breast and Ovarian Cancer Syndrome", + "Human Papillomavirus-Related Endocervical Adenocarcinoma", + "Invasive Breast Carcinoma", + "Lipoma", + "Lung Adenocarcinoma", + "Lung Adenosquamous Carcinoma", + "Lung Carcinoid Tumor", + "Lung Giant Cell Carcinoma", + "Lung Large Cell Carcinoma", + "Lung Non-Small Cell Carcinoma", + "Lung Papillary Adenocarcinoma", + "Lung Small Cell Carcinoma", + "Lung Squamous Cell Carcinoma", + "Malignant Peripheral Nerve Sheath Tumor", + "Melanoma", + "Minimally Invasive Lung Adenocarcinoma", + "Mouse Adrenal Gland Pheochromocytoma", + "Neuroblastoma", + "Neurofibroma", + "Noonan Syndrome", + "Ovarian Cystadenocarcinoma", + "Pancreatic Adenocarcinoma", + "Pancreatic Adenosquamous Carcinoma", + "Pancreatic Carcinoma", + "Pancreatic Ductal Adenocarcinoma", + "Pancreatic Somatostatinoma", + "Plexiform Neurofibroma", + "Pleural Malignant Mesothelioma", + "Poorly Differentiated Thyroid Gland Carcinoma", + "Rectal Adenocarcinoma", + "Schwannoma", + "Thyroid Gland Anaplastic Carcinoma", + "Thyroid Gland Follicular Carcinoma", + "Unaffected Nerve" ] - }, - "populationDoublingTime": { - "type": "number", - "title": "Population Doubling Time (in hours)" - }, - "publicationDOI": { - "type": "string", - "title": "Publication Link (DOI)" - }, - "itemAcquisition": { - "type": "string", - "title": "How to acquire", - "enum": [ - "Contact Developer", - "Purchase from Vendor", - "Other" - ], - "default": "Contact Developer" } }, - "allOf": [ - { - "if": { - "properties": { - "userInfo": { - "properties": { - "isDeveloper": { - "const": "No" - } + "tissue": { + "type": "string", + "title": "Tissue Type", + "enum": [ + "Blood", + "Bone Marrow", + "Buccal Mucosa", + "Buffy Coat", + "Cerebral Cortex", + "Dorsal Root Ganglion", + "Embryonic Tissue", + "Meninges", + "Nerve Tissue", + "Optic Nerve", + "Plasma", + "Primary Tumor", + "Sciatic Nerve", + "Serum", + "Splenocyte", + "Unspecified", + "Urine", + "Whole Brain" + ] + }, + "populationDoublingTime": { + "type": "number", + "title": "Population Doubling Time (in hours)" + }, + "publicationDOI": { + "type": "string", + "title": "Publication Link (DOI)" + }, + "itemAcquisition": { + "type": "string", + "title": "How to acquire", + "enum": [ + "Contact Developer", + "Purchase from Vendor", + "Other" + ], + "default": "Contact Developer" + } +}, +"allOf": [ + { + "if": { + "properties": { + "userInfo": { + "properties": { + "isDeveloper": { + "const": "No" } } } - }, - "then": { - "properties": { - "userInfo": { - "properties": { - "developerName": { - "type": "string", - "title": "Developer Name" - }, - "developerAffiliation": { - "type": "string", - "title": "Developer Affiliation" - } + } + }, + "then": { + "properties": { + "userInfo": { + "properties": { + "developerName": { + "type": "string", + "title": "Developer Name" + }, + "developerAffiliation": { + "type": "string", + "title": "Developer Affiliation" } } } } + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Purchase from Vendor" + } + } }, - { - "if": { - "properties": { - "itemAcquisition": { - "const": "Purchase from Vendor" - } + "then": { + "properties": { + "vendor": { + "type": "string", + "title": "Vendor Name" + }, + "catalogNumber": { + "type": "string", + "title": "Catalog Number" + }, + "catalogURL": { + "type": "string", + "title": "Link to vendor page" } - }, - "then": { - "properties": { - "vendor": { - "type": "string", - "title": "Vendor Name" - }, - "catalogNumber": { - "type": "string", - "title": "Catalog Number" - }, - "catalogURL": { - "type": "string", - "title": "Link to vendor page" - } + } + } + }, + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Other" } } }, - { - "if": { - "properties": { - "itemAcquisition": { - "const": "Other" - } + "then": { + "properties": { + "additionalDetails": { + "type": "string", + "title": "Please provide additional details." } }, - "then": { - "properties": { - "additionalDetails": { - "type": "string", - "title": "Please provide additional details." - } - }, - "required": [ - "additionalDetails" - ] - } + "required": [ + "additionalDetails" + ] } - ] + } +] } \ No newline at end of file diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json index d6f72af..ec641af 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -9,7 +9,7 @@ } }, "cellLineManifestation": { - "ui:widget": "select", + "ui:widget": "checkboxes", "ui:options": { "multiple": true } From 2e3bc5d3bf1f4a70b120ed80169d23fcee97cc8b Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:20:29 +0000 Subject: [PATCH 13/20] checkbox test --- .../cell-line/submitCellLine.json | 211 +++++++++--------- .../cell-line/submitCellLineUiSchema.json | 5 +- 2 files changed, 106 insertions(+), 110 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index c4039a6..6641ae8 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -122,8 +122,8 @@ ] }, "cellLineManifestation": { - "type": "array", - "title": "Cell Line Manifestation", + "type": "string", + "title": "Manifestation", "enum": [ "Acute Lymphocytic Leukemia", "Adult T Acute Lymphoblastic Leukemia", @@ -186,125 +186,124 @@ "Thyroid Gland Follicular Carcinoma", "Unaffected Nerve" ] + }, + "tissue": { + "type": "string", + "title": "Tissue Type", + "enum": [ + "Blood", + "Bone Marrow", + "Buccal Mucosa", + "Buffy Coat", + "Cerebral Cortex", + "Dorsal Root Ganglion", + "Embryonic Tissue", + "Meninges", + "Nerve Tissue", + "Optic Nerve", + "Plasma", + "Primary Tumor", + "Sciatic Nerve", + "Serum", + "Splenocyte", + "Unspecified", + "Urine", + "Whole Brain" + ] + }, + "populationDoublingTime": { + "type": "number", + "title": "Population Doubling Time (in hours)" + }, + "publicationDOI": { + "type": "string", + "title": "Publication Link (DOI)" + }, + "itemAcquisition": { + "type": "string", + "title": "How to acquire", + "enum": [ + "Contact Developer", + "Purchase from Vendor", + "Other" + ], + "default": "Contact Developer" } }, - "tissue": { - "type": "string", - "title": "Tissue Type", - "enum": [ - "Blood", - "Bone Marrow", - "Buccal Mucosa", - "Buffy Coat", - "Cerebral Cortex", - "Dorsal Root Ganglion", - "Embryonic Tissue", - "Meninges", - "Nerve Tissue", - "Optic Nerve", - "Plasma", - "Primary Tumor", - "Sciatic Nerve", - "Serum", - "Splenocyte", - "Unspecified", - "Urine", - "Whole Brain" - ] - }, - "populationDoublingTime": { - "type": "number", - "title": "Population Doubling Time (in hours)" - }, - "publicationDOI": { - "type": "string", - "title": "Publication Link (DOI)" - }, - "itemAcquisition": { - "type": "string", - "title": "How to acquire", - "enum": [ - "Contact Developer", - "Purchase from Vendor", - "Other" - ], - "default": "Contact Developer" - } -}, -"allOf": [ - { - "if": { - "properties": { - "userInfo": { - "properties": { - "isDeveloper": { - "const": "No" + "allOf": [ + { + "if": { + "properties": { + "userInfo": { + "properties": { + "isDeveloper": { + "const": "No" + } } } } - } - }, - "then": { - "properties": { - "userInfo": { - "properties": { - "developerName": { - "type": "string", - "title": "Developer Name" - }, - "developerAffiliation": { - "type": "string", - "title": "Developer Affiliation" + }, + "then": { + "properties": { + "userInfo": { + "properties": { + "developerName": { + "type": "string", + "title": "Developer Name" + }, + "developerAffiliation": { + "type": "string", + "title": "Developer Affiliation" + } } } } } - } - }, - { - "if": { - "properties": { - "itemAcquisition": { - "const": "Purchase from Vendor" - } - } }, - "then": { - "properties": { - "vendor": { - "type": "string", - "title": "Vendor Name" - }, - "catalogNumber": { - "type": "string", - "title": "Catalog Number" - }, - "catalogURL": { - "type": "string", - "title": "Link to vendor page" + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Purchase from Vendor" + } } - } - } - }, - { - "if": { - "properties": { - "itemAcquisition": { - "const": "Other" + }, + "then": { + "properties": { + "vendor": { + "type": "string", + "title": "Vendor Name" + }, + "catalogNumber": { + "type": "string", + "title": "Catalog Number" + }, + "catalogURL": { + "type": "string", + "title": "Link to vendor page" + } } } }, - "then": { - "properties": { - "additionalDetails": { - "type": "string", - "title": "Please provide additional details." + { + "if": { + "properties": { + "itemAcquisition": { + "const": "Other" + } } }, - "required": [ - "additionalDetails" - ] + "then": { + "properties": { + "additionalDetails": { + "type": "string", + "title": "Please provide additional details." + } + }, + "required": [ + "additionalDetails" + ] + } } - } -] + ] } \ No newline at end of file diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json index ec641af..9b3bd6c 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -9,9 +9,6 @@ } }, "cellLineManifestation": { - "ui:widget": "checkboxes", - "ui:options": { - "multiple": true - } + "ui:widget": "checkboxes" } } \ No newline at end of file From bbf13bbf5e3bc2dab362bb5ab3113d69d846ccfc Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:21:42 +0000 Subject: [PATCH 14/20] small change --- NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json index 9b3bd6c..ea99828 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -7,8 +7,5 @@ "rows": 5 } } - }, - "cellLineManifestation": { - "ui:widget": "checkboxes" } } \ No newline at end of file From 1cf42354316e6190cfcd3d9f44901f99aa993fb9 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:27:57 +0000 Subject: [PATCH 15/20] add more details --- .../cell-line/submitCellLine.json | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index 6641ae8..bd158fb 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -43,15 +43,32 @@ "properties": { "cellLineName": { "type": "string", - "title": "Name of Cell Line" + "title": "Name of Cell Line", + "minLength": 3, + "maxLength": 100, + "description": "Provide the official name of the cell line.", + "examples": [ + "HEK293 NF1 -/- with R1306X mNf1 cDNA", + "SZ-NF4" + ], + "errorMessage": { + "minLength": "Cell line name should have at least 3 characters.", + "maxLength": "Cell line name should not exceed 100 characters." + } }, "synonyms": { - "type": "string", - "title": "Synonyms" + "type": "array", + "title": "Synonyms", + "items": { + "type": "string" + }, + "uniqueItems": true, + "description": "Add one or more synonyms for the cell line." }, "description": { "type": "string", - "title": "Description (~20 words)" + "title": "Description (~20 words)", + "description": "Add a description in plain language of the cell line." }, "species": { "type": "string", @@ -90,8 +107,8 @@ ] }, "age": { - "type": "string", - "title": "Age" + "type": "number", + "title": "Age (years)" } }, "required": [ From a0d6fdaa6819b3152e601913b9e0b01b826e826b Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:31:53 +0000 Subject: [PATCH 16/20] radio buttons, synoynm number --- NF-Tools-Schemas/cell-line/submitCellLine.json | 1 + .../cell-line/submitCellLineUiSchema.json | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index bd158fb..c0ac1b2 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -62,6 +62,7 @@ "items": { "type": "string" }, + "minItems": 1, "uniqueItems": true, "description": "Add one or more synonyms for the cell line." }, diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json index ea99828..3ea1c2a 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -6,6 +6,18 @@ "ui:options": { "rows": 5 } + }, + "species": { + "ui:widget": "radio", + "ui:inline": "true" + }, + "sex": { + "ui:widget": "radio", + "ui:inline": "true" + }, + "race": { + "ui:widget": "radio", + "ui:inline": "true" } } } \ No newline at end of file From 0b0c3a21b925701041cfaa627d352680f8a9677f Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:35:17 +0000 Subject: [PATCH 17/20] small fix --- .../cell-line/submitCellLine.json | 7 +--- .../cell-line/submitCellLineUiSchema.json | 36 ++++++++++--------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index c0ac1b2..0776070 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -57,13 +57,8 @@ } }, "synonyms": { - "type": "array", + "type": "string", "title": "Synonyms", - "items": { - "type": "string" - }, - "minItems": 1, - "uniqueItems": true, "description": "Add one or more synonyms for the cell line." }, "description": { diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json index 3ea1c2a..620eba4 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -1,23 +1,25 @@ { "basicInfo": { - "description": { - "ui:widget": "textarea", - "ui:placeholder": "Provide a brief description (~20 words)", - "ui:options": { - "rows": 5 + "properties": { + "description": { + "ui:widget": "textarea", + "ui:placeholder": "Provide a brief description (~20 words)", + "ui:options": { + "rows": 5 + } + }, + "species": { + "ui:widget": "radio", + "ui:inline": "true" + }, + "sex": { + "ui:widget": "radio", + "ui:inline": "true" + }, + "race": { + "ui:widget": "radio", + "ui:inline": "true" } - }, - "species": { - "ui:widget": "radio", - "ui:inline": "true" - }, - "sex": { - "ui:widget": "radio", - "ui:inline": "true" - }, - "race": { - "ui:widget": "radio", - "ui:inline": "true" } } } \ No newline at end of file From 1c4e5a9d88065b9800f7757b5c9484a1a2cf9b7a Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:36:39 +0000 Subject: [PATCH 18/20] fix ui schema --- .../cell-line/submitCellLineUiSchema.json | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json index 620eba4..ce2d769 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json +++ b/NF-Tools-Schemas/cell-line/submitCellLineUiSchema.json @@ -1,25 +1,29 @@ { "basicInfo": { - "properties": { - "description": { - "ui:widget": "textarea", - "ui:placeholder": "Provide a brief description (~20 words)", - "ui:options": { - "rows": 5 - } - }, - "species": { - "ui:widget": "radio", - "ui:inline": "true" - }, - "sex": { - "ui:widget": "radio", - "ui:inline": "true" - }, - "race": { - "ui:widget": "radio", - "ui:inline": "true" + "description": { + "ui:widget": "textarea", + "ui:placeholder": "Provide a brief description (~20 words)", + "ui:options": { + "rows": 5 + } + }, + "species": { + "ui:widget": "radio", + "ui:options": { + "inline": true + } + }, + "sex": { + "ui:widget": "radio", + "ui:options": { + "inline": true + } + }, + "race": { + "ui:widget": "radio", + "ui:options": { + "inline": true } } } -} \ No newline at end of file +} From c98afce6efd75d0601a65dae90656c8ceae56734 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:45:38 +0000 Subject: [PATCH 19/20] small changes --- NF-Tools-Schemas/cell-line/submitCellLine.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index 0776070..009d4ab 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -57,8 +57,11 @@ } }, "synonyms": { - "type": "string", + "type": "array", "title": "Synonyms", + "items": { + "type": "string" + }, "description": "Add one or more synonyms for the cell line." }, "description": { @@ -104,7 +107,9 @@ }, "age": { "type": "number", - "title": "Age (years)" + "title": "Age (years)", + "minimum": 0, + "maximum": 120 } }, "required": [ From cc2a0086130fa815af25bcbca5f88552088b6062 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:59:04 +0000 Subject: [PATCH 20/20] remove string list for synonyms --- NF-Tools-Schemas/cell-line/submitCellLine.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/NF-Tools-Schemas/cell-line/submitCellLine.json b/NF-Tools-Schemas/cell-line/submitCellLine.json index 009d4ab..2c8cbd3 100644 --- a/NF-Tools-Schemas/cell-line/submitCellLine.json +++ b/NF-Tools-Schemas/cell-line/submitCellLine.json @@ -57,11 +57,8 @@ } }, "synonyms": { - "type": "array", + "type": "string", "title": "Synonyms", - "items": { - "type": "string" - }, "description": "Add one or more synonyms for the cell line." }, "description": { @@ -86,7 +83,7 @@ "enum": [ "Male", "Female", - "Unkown" + "Unknown" ] }, "race": {