process review comments

molgenis · Dec 16, 2024 · 4d9a361 · 4d9a361
1 parent a531eb2
commit 4d9a361
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/apps/central/src/components/SchemaCreateModal.vue b/apps/central/src/components/SchemaCreateModal.vue
@@ -145,7 +145,7 @@ export default {
         "UMCU_COHORTS_STAGING",
         "INTEGRATE_COHORTS_STAGING",
         "RD3",
-        "RD3v2",
+        "RD3_V2",
         "JRC_COMMON_DATA_ELEMENTS",
         "FAIR_GENOMES",
         "DCAT",

diff --git a/backend/molgenis-emx2-datamodels/src/main/java/org/molgenis/emx2/datamodels/DataModels.java b/backend/molgenis-emx2-datamodels/src/main/java/org/molgenis/emx2/datamodels/DataModels.java
@@ -52,7 +52,7 @@ public enum Regular {
     ERN_DASHBOARD(DashboardLoader::new),
     PROJECTMANAGER(ProjectManagerLoader::new),
     BIOBANK_DIRECTORY(BiobankDirectoryLoader::new),
-    RD3v2(RD3v2Loader::new),
+    RD3_V2(RD3v2Loader::new),
     BIOBANK_DIRECTORY_STAGING(
         ((schema, includeDemoData) ->
             new BiobankDirectoryLoader(schema, includeDemoData).setStaging(true)));

diff --git a/backend/molgenis-emx2-datamodels/src/test/java/org/molgenis/emx2/datamodels/TestLoaders.java b/backend/molgenis-emx2-datamodels/src/test/java/org/molgenis/emx2/datamodels/TestLoaders.java
@@ -61,6 +61,15 @@ public static void setup() {
     database.dropSchemaIfExists(CATALOGUE_ONTOLOGIES);
   }
 
+  @Test
+  void test00PortalLoader() throws URISyntaxException, IOException {
+    // depends on catalogue test above
+    Schema schema = databa
+    se.dropCreateSchema(PORTAL_TEST);
+    DataModels.Regular.RD3_V2.getImportTask(schema, false).run();
+    assertEquals(94, schema.getTableNames().size());
+  }
+
   @Test
   public void test01FAIRDataHubLoader() {
     Schema fairDataHubSchema = database.createSchema(FAIR_DATA_HUB_TEST);
@@ -155,12 +164,4 @@ void test17FAIRDataPointLoader() {
     DataModels.Profile.FAIR_DATA_POINT.getImportTask(FDPSchema, true).run();
     assertEquals(25, FDPSchema.getTableNames().size());
   }
-
-  @Test
-  void test18PortalLoader() throws URISyntaxException, IOException {
-    // depends on catalogue test above
-    Schema schema = database.dropCreateSchema(PORTAL_TEST);
-    DataModels.Regular.RD3v2.getImportTask(schema, false).run();
-    assertEquals(94, schema.getTableNames().size());
-  }
 }