Merge pull request #72 from nf-osi/additional-models

Additional models
nf-osi · Oct 3, 2024 · 7016d96 · 7016d96
2 parents c6d0df8 + 44f8933
commit 7016d96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 25 deletions.
diff --git 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",
@@ -60,7 +61,8 @@
             "Other"
           ]
         }
-      }
+      },
+      "required": ["animalModelName", "description", "species"]
     },
     "backgroundStrain": {
       "type": "string",
@@ -212,6 +214,7 @@
       "default": "Contact Developer"
     }
   },
+  "required": ["animalModelDisease"],
   "allOf": [
     {
       "if": {
@@ -316,16 +319,5 @@
             ]
           }
         }
-      ],
-      "required": [
-        "userInfo.first_name",
-        "userInfo.last_name",
-        "userInfo.email",
-        "userInfo.isDeveloper",
-        "animalModelName",
-        "description",
-        "backgroundStrain",
-        "animalModelDisease",
-        "animalModelManifestation"
       ]
     }
diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagent.json
@@ -30,7 +30,8 @@
           ],
           "default": "Yes"
         }
-      }
+      }, 
+      "required": ["firstandlastName", "email", "isDeveloper"]
     },
     "insertName": {
       "type": "string",
@@ -314,11 +315,7 @@
               }
             }
           }
-        },
-        "required": [
-          "userInfo.developerName",
-          "userInfo.developerAffiliation"
-        ]
+        }
       }
     },
     {
@@ -368,12 +365,7 @@
     }
   ],
   "required": [
-    "userInfo.firstandlastName",
-    "userInfo.email",
-    "userInfo.isDeveloper",
-    "geneticReagentId",
     "insertName",
-    "insertSize",
     "insertSpecies"
   ]
 }
diff --git a/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json b/NF-Tools-Schemas/genetic-reagent/submitGeneticReagentUiSchema.json
@@ -15,4 +15,4 @@
         "ui:widget": "radio",
         "ui:inline": "true"
     }
-}
+}