From b370153f3b818944516a1ea9942525f1f889bad2 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:14:51 -0400 Subject: [PATCH 1/7] Update submitGeneticReagent.json --- .../genetic-reagent/submitGeneticReagent.json | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json index b2b2acb..eaf331a 100644 --- a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json +++ b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json @@ -316,8 +316,8 @@ } }, "required": [ - "userInfo.developerName", - "userInfo.developerAffiliation" + "developerName", + "developerAffiliation" ] } }, @@ -368,12 +368,9 @@ } ], "required": [ - "userInfo.firstandlastName", - "userInfo.email", - "userInfo.isDeveloper", - "geneticReagentId", + "firstandlastName", + "email", "insertName", - "insertSize", "insertSpecies" ] } From 539f986cc72a604548f986c244d6d817172bdab2 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:21:18 -0400 Subject: [PATCH 2/7] Update submitGeneticReagent.json --- NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json index eaf331a..44fc825 100644 --- a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json +++ b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json @@ -30,7 +30,8 @@ ], "default": "Yes" } - } + }, + "required": {"isDeveloper"}, }, "insertName": { "type": "string", @@ -368,8 +369,6 @@ } ], "required": [ - "firstandlastName", - "email", "insertName", "insertSpecies" ] From b2820297b8054ebcf902e45f28aa397fefd2f319 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:30:43 +0000 Subject: [PATCH 3/7] fix required --- NF-Tools-Schemas/animal-model/submitAnimalModel.json | 7 ++----- NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/NF-Tools-Schemas/animal-model/submitAnimalModel.json b/NF-Tools-Schemas/animal-model/submitAnimalModel.json index 112132e..21fb3ed 100644 --- a/NF-Tools-Schemas/animal-model/submitAnimalModel.json +++ b/NF-Tools-Schemas/animal-model/submitAnimalModel.json @@ -30,7 +30,8 @@ ], "default": "Yes" } - } + }, + "required": ["firstandlastName", "email", "isDeveloper"] }, "basicInfo": { "type": "object", @@ -318,10 +319,6 @@ } ], "required": [ - "userInfo.first_name", - "userInfo.last_name", - "userInfo.email", - "userInfo.isDeveloper", "animalModelName", "description", "backgroundStrain", diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json index 44fc825..1d402dc 100644 --- a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json +++ b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json @@ -31,7 +31,7 @@ "default": "Yes" } }, - "required": {"isDeveloper"}, + "required": ["firstandlastName", "email", "isDeveloper"] }, "insertName": { "type": "string", From 5775543e4302e6bd597b41413960f6338ceab6b4 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:40:13 +0000 Subject: [PATCH 4/7] add required --- NF-Tools-Schemas/animal-model/submitAnimalModel.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/NF-Tools-Schemas/animal-model/submitAnimalModel.json b/NF-Tools-Schemas/animal-model/submitAnimalModel.json index 21fb3ed..4712bb3 100644 --- a/NF-Tools-Schemas/animal-model/submitAnimalModel.json +++ b/NF-Tools-Schemas/animal-model/submitAnimalModel.json @@ -36,6 +36,7 @@ "basicInfo": { "type": "object", "title": "", + "required": ["animalModelName", "description", "species", "animalModelDisease"], "properties": { "animalModelName": { "type": "string", @@ -317,12 +318,5 @@ ] } } - ], - "required": [ - "animalModelName", - "description", - "backgroundStrain", - "animalModelDisease", - "animalModelManifestation" ] } \ No newline at end of file From 056454f4759bc0f2ab799f509ec90052ebc31ef3 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:49:23 +0000 Subject: [PATCH 5/7] fix required animalModel --- NF-Tools-Schemas/animal-model/submitAnimalModel.json | 5 +++-- .../genetic-reagent/submitGeneticReagentUiSchema.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NF-Tools-Schemas/animal-model/submitAnimalModel.json b/NF-Tools-Schemas/animal-model/submitAnimalModel.json index 4712bb3..81035f0 100644 --- a/NF-Tools-Schemas/animal-model/submitAnimalModel.json +++ b/NF-Tools-Schemas/animal-model/submitAnimalModel.json @@ -36,7 +36,6 @@ "basicInfo": { "type": "object", "title": "", - "required": ["animalModelName", "description", "species", "animalModelDisease"], "properties": { "animalModelName": { "type": "string", @@ -62,7 +61,8 @@ "Other" ] } - } + }, + "required": ["animalModelName", "description", "species"] }, "backgroundStrain": { "type": "string", @@ -214,6 +214,7 @@ "default": "Contact Developer" } }, + "required": ["animalModelDisease"], "allOf": [ { "if": { diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json index caa110f..3f7514c 100644 --- a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json +++ b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json @@ -1,5 +1,5 @@ { - "insertSpecies": { + "species": { "ui:widget": "radio", "ui:inline": "true" }, From 0c52963808ec08aedc8547708cdb24c3567832fa Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 16:01:32 -0400 Subject: [PATCH 6/7] Update submitGeneticReagentUiSchema.json --- .../genetic-reagent/submitGeneticReagentUiSchema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json index 3f7514c..65cbf23 100644 --- a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json +++ b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json @@ -1,5 +1,5 @@ { - "species": { + "insertSpecies": { "ui:widget": "radio", "ui:inline": "true" }, @@ -15,4 +15,4 @@ "ui:widget": "radio", "ui:inline": "true" } -} \ No newline at end of file +} From 44f8933c7f8d6084361ea4bebe813e624b6f4437 Mon Sep 17 00:00:00 2001 From: Christina Conrad <114612268+cconrad8@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:11:56 +0000 Subject: [PATCH 7/7] remove developer required --- NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json index 1d402dc..aad514f 100644 --- a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json +++ b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json @@ -315,11 +315,7 @@ } } } - }, - "required": [ - "developerName", - "developerAffiliation" - ] + } } }, {