Merge pull request #279 from IN-CORE/main

Main to develop

CHANGELOG.md

@@ -5,14 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [1.25.0] - 2024-02-21
 
 ### Changed
 - Join between CSV table and shapefile has been updated based on Geotools update [#272](https://github.com/IN-CORE/incore-services/issues/272)
 
 ### Added 
 - Add retrofit information to the mapping set class [#252](https://github.com/IN-CORE/incore-services/issues/252)
 
+### Fixed
+- Fix broken Semantics Type embedded in data viewer [#273](https://github.com/IN-CORE/incore-services/issues/273)
 
 ## [1.24.0] - 2024-02-07
 

server/build.gradle

@@ -48,7 +48,7 @@ apply plugin: 'war'
 // This will not apply to the war files we build unless we put it within project loop
 // at the end of this file. This is only for the docker build to pull a version
 war {
-    archiveVersion = '1.24.0'
+    archiveVersion = '1.25.0'
 }
 
 apply plugin: 'org.gretty'

server/data-service/src/main/java/edu/illinois/ncsa/incore/service/data/controllers/DatasetController.java

@@ -71,7 +71,7 @@
 @OpenAPIDefinition(
     info = @Info(
         description = "IN-CORE Data Service for creating and accessing datasets",
-        version = "1.24.0",
+        version = "1.25.0",
         title = "IN-CORE v2 Data Service API",
         contact = @Contact(
             name = "IN-CORE Dev Team",

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/FragilityController.java

@@ -56,7 +56,7 @@
 
 @OpenAPIDefinition(
     info = @Info(
-        version = "1.24.0",
+        version = "1.25.0",
         description = "IN-CORE Service For Fragilities and Fragility mappings",
 
         title = "IN-CORE v2 Fragility Service API",

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RepairController.java

@@ -49,7 +49,7 @@
 
 @OpenAPIDefinition(
     info = @Info(
-        version = "1.24.0",
+        version = "1.25.0",
         description = "IN-CORE Service For Repair and Repair mappings",
 
         title = "IN-CORE v2 DFR3 Service API",

server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RestorationController.java

@@ -47,7 +47,7 @@
 
 @OpenAPIDefinition(
     info = @Info(
-        version = "1.24.0",
+        version = "1.25.0",
         description = "IN-CORE Service For Restoration and Restoration mappings",
 
         title = "IN-CORE v2 DFR3 Service API",

server/hazard-service/src/main/java/edu/illinois/ncsa/incore/service/hazard/controllers/EarthquakeController.java

@@ -81,7 +81,7 @@
 @OpenAPIDefinition(
     info = @Info(
         description = "IN-CORE Hazard Service For Earthquake, Tornado, Tsunami, Hurricane and Flood",
-        version = "1.24.0",
+        version = "1.25.0",
         title = "IN-CORE v2 Hazard Service API",
         contact = @Contact(
             name = "IN-CORE Dev Team",

server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/StatusController.java

@@ -16,7 +16,7 @@
 @OpenAPIDefinition(
     info = @Info(
         description = "IN-CORE Semantics Services for type and data type",
-        version = "1.24.0",
+        version = "1.25.0",
         title = "IN-CORE v2 Semantics Service API",
         contact = @Contact(
             name = "IN-CORE Dev Team",

server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/TypeController.java

@@ -47,7 +47,7 @@
 @OpenAPIDefinition(
     info = @Info(
         description = "IN-CORE Semantics Services for type and data type",
-        version = "1.24.0",
+        version = "1.25.0",
         title = "IN-CORE v2 Semantics Service API",
         contact = @Contact(
             name = "IN-CORE Dev Team",
@@ -223,7 +223,7 @@ public Response getTypeAsHtml(
         if (matchedType != null) {
             ObjectMapper objectMapper = new ObjectMapper();
             // Convert the Type to JSONObject
-            String jsonString = objectMapper.writeValueAsString(matchedType);
+            String jsonString = objectMapper.writeValueAsString(matchedType.constructOutput());
             JSONObject typeJson = new JSONObject(jsonString);
             JSONObject tableSchema = typeJson.getJSONObject("tableSchema");
             JSONArray columnsArray = tableSchema.getJSONArray("columns");

server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/AllocationsController.java

@@ -38,7 +38,7 @@
 @OpenAPIDefinition(
     info = @Info(
         description = "IN-CORE Allocations Service for getting the user's allocation information.",
-        version = "1.24.0",
+        version = "1.25.0",
         title = "IN-CORE v2 Allocation Service API",
         contact = @Contact(
             name = "IN-CORE Dev Team",

server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/SpaceController.java

@@ -51,7 +51,7 @@
 @OpenAPIDefinition(
     info = @Info(
         description = "IN-CORE Space Service for creating and accessing spaces",
-        version = "1.24.0",
+        version = "1.25.0",
         title = "IN-CORE v2 Space Service API",
         contact = @Contact(
             name = "IN-CORE Dev Team",

server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/UsageController.java

@@ -40,7 +40,7 @@
 @OpenAPIDefinition(
     info = @Info(
         description = "IN-CORE Usage Service for getting the user's usage information.",
-        version = "1.24.0",
+        version = "1.25.0",
         title = "IN-CORE v2 Usage Service API",
         contact = @Contact(
             name = "IN-CORE Dev Team",