chore: load petstore via profile

apps/metadata-utils/src/types.ts

@@ -76,7 +76,6 @@ export interface ITableMetaData {
   description?: string;
   tableType: string;
   columns: IColumn[];
-  schemaId: string;
   semantics?: string[];
   settings?: ISetting[];
 }

apps/molgenis-components/src/client/client.ts

@@ -62,8 +62,7 @@ const client: IClient = {
       ) => {
         const schemaMetaData = await fetchSchemaMetaData(schemaId);
         const tableMetaData = schemaMetaData.tables.find(
-          (table: ITableMetaData) =>
-            table.id === tableId && table.schemaId === schemaMetaData.id
+          (table: ITableMetaData) => table.id === tableId
         );
         const filter = tableMetaData?.columns
           ?.filter((column: IColumn) => column.key === 1)
@@ -167,12 +166,10 @@ const metadataQuery = `{
   _schema {
     id,
     tables {
-      schemaId,
       id,
       label, 
       description,
       tableType,
-      schemaId,
       semantics,
       columns {
         id,
@@ -395,8 +392,7 @@ async function convertRowToPrimaryKey(
 ): Promise<Record<string, any>> {
   const schema = await fetchSchemaMetaData(schemaId);
   const tableMetadata = schema.tables.find(
-    (table: ITableMetaData) =>
-      table.id === tableId && table.schemaId === schema.id
+    (table: ITableMetaData) => table.id === tableId
   );
   if (!tableMetadata?.columns) {
     throw new Error("Empty columns in metadata");

apps/molgenis-components/src/client/queryBuilder.ts

@@ -57,8 +57,6 @@ const getColumns = (
   tableId: string,
   tableStore: ITableMetaData[]
 ) => {
-  const result = tableStore.find(
-    (table) => table.id === tableId && table.schemaId === schemaId
-  );
+  const result = tableStore.find((table) => table.id === tableId);
   return result?.columns || [];
 };

apps/molgenis-components/src/components/forms/RowEdit.vue

@@ -188,7 +188,7 @@ export default {
               equals: await convertRowToPrimaryKey(
                 this.internalValues[changedColumn.id],
                 overlappingKey.refTableId,
-                overlappingKey.refSchemaId
+                overlappingKey.refSchemaId || this.schemaMetaData.schemaId
               ),
             },
           };

apps/nuxt3-ssr/gql/metadata.js

@@ -9,7 +9,6 @@ export default gql`
         label
         tableType
         description
-        schemaId
         semantics
         columns {
           id

apps/schema/src/components/Schema.vue

@@ -188,7 +188,6 @@ export default {
         }
       });
       tables.forEach((table) => {
-        delete table.schemaId;
         table.columns = table.columns
           ? table.columns.filter((column) => column.table === table.name)
           : [];

apps/schema/src/utils.ts

@@ -11,7 +11,6 @@ export const schemaQuery = gql`
       name
       tables {
         name
-        schemaName
         tableType
         inheritName
         labels {
@@ -63,10 +62,7 @@ export function addOldNamesAndRemoveMeta(rawSchema: any) {
     //normal tables
     let tables = !schema.tables
       ? []
-      : schema.tables.filter(
-          (table) =>
-            table.tableType !== "ONTOLOGIES" && table.schemaName === schema.name
-        );
+      : schema.tables.filter((table) => table.tableType !== "ONTOLOGIES");
     tables.forEach((t) => {
       t.oldName = t.name;
       if (t.columns) {
@@ -83,10 +79,7 @@ export function addOldNamesAndRemoveMeta(rawSchema: any) {
     });
     schema.ontologies = !schema.tables
       ? []
-      : schema.tables.filter(
-          (table) =>
-            table.tableType === "ONTOLOGIES" && table.schemaName === schema.name
-        );
+      : schema.tables.filter((table) => table.tableType === "ONTOLOGIES");
     //set old name so we can delete them properly
     schema.ontologies.forEach((o) => {
       o.oldName = o.name;
@@ -205,7 +198,6 @@ export function addTableIdsLabelsDescription(originalTable: ITableMetaData) {
   table.id = convertToPascalCase(table.name);
   table.label = getLocalizedLabel(table);
   table.description = getLocalizedDescription(table, "en");
-  table.schemaId = table.schemaName;
   table.inheritId = convertToPascalCase(table.inheritName);
   table.columns = table.columns.map((column) => {
     column.id = convertToCamelCase(column.name);

apps/tables/src/App.vue

@@ -43,7 +43,7 @@ export default {
       this.error = null;
       request(
         "graphql",
-        "{_schema{id,label,tables{id,label,tableType,schemaId,description,columns{id,label,columnType,key,refTableId,required,description}}}}"
+        "{_schema{id,label,tables{id,label,tableType,description,columns{id,label,columnType,key,refTableId,required,description}}}}"
       )
         .then((data) => {
           this.schema = data._schema;

apps/tables/src/components/ListTables.vue

@@ -63,20 +63,16 @@ export default {
       }
       if (this.search && this.search.trim().length > 0) {
         let terms = this.search.toLowerCase().split(" ");
-        return this.schema.tables
-          .filter((table) => table.schemaId === this.schema.id)
-          .filter((table) =>
-            terms.every(
-              (term) =>
-                table.label.toLowerCase().includes(term) ||
-                (table.description &&
-                  table.description.toLowerCase().includes(term))
-            )
-          );
-      } else {
-        return this.schema.tables.filter(
-          (table) => table.schemaId === this.schema.id
+        return this.schema.tables.filter((table) =>
+          terms.every(
+            (term) =>
+              table.label.toLowerCase().includes(term) ||
+              (table.description &&
+                table.description.toLowerCase().includes(term))
+          )
         );
+      } else {
+        return this.schema.tables;
       }
     },
     tables() {

apps/tailwind-components/components/form/Fields.vue

@@ -43,11 +43,19 @@ const chapters = computed(() => {
 });
 
 const dataMap = reactive(
-  Object.fromEntries(props.metadata.columns.map((column) => [column.id, ""]))
+  Object.fromEntries(
+    props.metadata.columns
+      .filter((column) => column.columnType !== "HEADING")
+      .map((column) => [column.id, ""])
+  )
 );
 
 const errorMap = reactive(
-  Object.fromEntries(props.metadata.columns.map((column) => [column.id, []]))
+  Object.fromEntries(
+    props.metadata.columns
+      .filter((column) => column.columnType !== "HEADING")
+      .map((column) => [column.id, []])
+  )
 );
 
 const numberOffFieldsWithErrors = computed(() =>

apps/tailwind-components/composables/fetchTableData.ts

@@ -69,7 +69,7 @@ export const getColumnIds = async (
   const metaData = await fetchMetadata(schemaId);
 
   const columns = metaData.tables.find(
-    (table) => table.id === tableId && table.schemaId === schemaId
+    (table) => table.id === tableId
   )?.columns || [];
 
   let gqlFields = "";

apps/ui/pages/[schema]/index.vue

@@ -26,7 +26,7 @@ const { data } = await useFetch<Resp<Schema>>(`/${schema}/graphql`, {
   key: "databases",
   method: "POST",
   body: {
-    query: `{_schema{id,label,tables{id,label,tableType,schemaId,description}}}`,
+    query: `{_schema{id,label,tables{id,label,tableType,description}}}`,
   },
 });
 

backend/molgenis-emx2-datamodels/src/main/java/org/molgenis/emx2/datamodels/DataModels.java

@@ -25,7 +25,8 @@ public enum Profile {
     BEACON_V2("_profiles/BeaconV2.yaml"),
     GDI("_profiles/GDI.yaml"),
     SHARED_STAGING("_profiles/SharedStaging.yaml"),
-    IMAGE_TEST("_profiles/ImageTest.yaml");
+    IMAGE_TEST("_profiles/ImageTest.yaml"),
+    PET_STORE("_profiles/PetStore.yaml");
 
     public static boolean hasProfile(String nameOther) {
       return Arrays.stream(values()).anyMatch(profile -> profile.name().equals(nameOther));
@@ -48,7 +49,6 @@ public Task getImportTask(Schema schema, boolean includeDemoData) {
 
   public enum Regular {
     DIRECTORY(DirectoryLoader::new),
-    PET_STORE(PetStoreLoader::new),
     ERN_DASHBOARD(DashboardLoader::new),
     PROJECTMANAGER(ProjectManagerLoader::new),
     BIOBANK_DIRECTORY(BiobankDirectoryLoader::new),