3410 bug missing concepts and datatype in dataset enrichment

packages/client/hmi-client/src/components/dataset/tera-dataset-overview-table.vue

@@ -120,16 +120,25 @@ function onCellEditComplete() {
 }
 
 function formatData(data: DatasetColumn[]) {
-	return data.map((col) => ({
-		id: col.name,
-		name: formatName(col.name),
-		description: col.description,
-		concept: col.metadata?.groundings?.identifiers,
-		unit: col.metadata?.unit,
-		dataType: col.metadata?.column_stats?.type,
-		stats: col.metadata?.column_stats,
-		column: col
-	}));
+	return data.map((col) => {
+		let concept: object | undefined;
+		if (col.metadata?.groundings?.identifiers) {
+			concept = col.metadata.groundings.identifiers;
+		} else if (col.grounding?.identifiers[0]) {
+			concept = parseCurie(String(col.grounding.identifiers[0].curie));
+		}
+
+		return {
+			id: col.name,
+			name: formatName(col.name),
+			description: col.description,
+			concept,
+			unit: col.metadata?.unit,
+			dataType: col.metadata?.column_stats?.type,
+			stats: col.metadata?.column_stats,
+			column: col
+		};
+	});
 }
 </script>
 

packages/client/hmi-client/src/types/Types.ts

@@ -95,10 +95,15 @@ export interface CsvColumnStats {
 }
 
 export interface Grounding {
-    identifiers: { [index: string]: string };
+    identifiers: Identifier[];
     context?: { [index: string]: any };
 }
 
+export interface Identifier {
+    curie: string;
+    name: string;
+}
+
 export interface PresignedURL {
     url: string;
     method: string;

packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java

@@ -42,6 +42,7 @@
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.models.dataservice.Grounding;
+import software.uncharted.terarium.hmiserver.models.dataservice.Identifier;
 import software.uncharted.terarium.hmiserver.models.dataservice.code.Code;
 import software.uncharted.terarium.hmiserver.models.dataservice.code.CodeFile;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
@@ -584,9 +585,11 @@ public ResponseEntity<Dataset> postProfileDataset(
 						continue;
 					}
 					if (groundings.getIdentifiers() == null) {
-						groundings.setIdentifiers(new HashMap<>());
+						groundings.setIdentifiers(new ArrayList<>());
 					}
-					groundings.getIdentifiers().put(g.get(0).asText(), g.get(1).asText());
+					groundings
+							.getIdentifiers()
+							.add(new Identifier(g.get(0).asText(), g.get(1).asText()));
 				}
 
 				// remove groundings from annotation object
@@ -596,10 +599,11 @@ public ResponseEntity<Dataset> postProfileDataset(
 				newCol.setName(col.getName());
 				newCol.setDataType(col.getDataType());
 				newCol.setFormatStr(col.getFormatStr());
-				newCol.setGrounding(col.getGrounding());
+				newCol.setGrounding(groundings);
 				newCol.setAnnotations(col.getAnnotations());
 				newCol.setDescription(annotation.get("description").asText());
-				newCol.setMetadata(mapper.convertValue(annotation, Map.class));
+				newCol.setMetadata(col.getMetadata());
+				newCol.updateMetadata(mapper.convertValue(annotation, Map.class));
 				columns.add(newCol);
 			}
 

packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Grounding.java

@@ -2,6 +2,7 @@
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -18,7 +19,7 @@ public class Grounding implements Serializable {
 	private static final long serialVersionUID = 302308407252037615L;
 
 	/** Ontological identifier per DKG */
-	private Map<String, String> identifiers;
+	private List<Identifier> identifiers;
 
 	/** (Optional) Additional context that informs the grounding */
 	@TSOptional

packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/Identifier.java

@@ -0,0 +1,9 @@
+package software.uncharted.terarium.hmiserver.models.dataservice;
+
+import java.io.Serializable;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@TSModel
+public record Identifier(String curie, String name) implements Serializable {
+	private static final long serialVersionUID = 302308407252037615L;
+}

packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/dataset/DatasetColumn.java

@@ -69,4 +69,12 @@ enum ColumnType {
 		@JsonAlias("time")
 		TIME
 	}
+
+	public void updateMetadata(final Map<String, Object> metadata) {
+		if (this.metadata == null) {
+			this.metadata = metadata;
+		} else {
+			this.metadata.putAll(metadata);
+		}
+	}
 }