model config fix (#4344)

Co-authored-by: Cole Blanchard <[email protected]>
DARPA-ASKEM · Aug 2, 2024 · 290ea77 · 290ea77
1 parent d584f9b
commit 290ea77
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...ges/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-node.vue b/...ges/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-node.vue
@@ -43,13 +43,13 @@ watch(
 
 		if (modelId) {
 			let configs = await getModelConfigurationsForModel(modelId);
-			if (!configs[0].id) {
+			if (!configs[0]?.id) {
 				const model = await getModel(modelId);
 				if (model) await postAsConfiguredModel(model); // Create a model configuration if it does not exist
 				configs = await getModelConfigurationsForModel(modelId);
 			}
 			// Auto append output
-			if (configs[0].id) {
+			if (configs[0]?.id) {
 				const config = configs[0];
 				state.transientModelConfig = config;
 				emit('update-state', state);

diff --git a/...in/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java b/...in/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
@@ -592,7 +592,10 @@ ResponseEntity<List<ModelConfiguration>> getModelConfigurationsForModelId(
 
 		try {
 			final List<ModelConfiguration> modelConfigurations =
-				modelConfigRepository.findByModelIdAndDeletedOnIsNullAndTemporaryFalse(id, PageRequest.of(page, pageSize));
+				modelConfigRepository.findByModelIdAndDeletedOnIsNullAndTemporaryFalseOrderByCreatedOnAsc(
+					id,
+					PageRequest.of(page, pageSize)
+				);
 
 			return ResponseEntity.ok(modelConfigurations);
 		} catch (final Exception e) {

diff --git a/...ain/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java b/...ain/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java
@@ -9,5 +9,8 @@
 
 @Repository
 public interface ModelConfigRepository extends PSCrudSoftDeleteRepository<ModelConfiguration, UUID> {
-	List<ModelConfiguration> findByModelIdAndDeletedOnIsNullAndTemporaryFalse(UUID modelId, Pageable pageable);
+	List<ModelConfiguration> findByModelIdAndDeletedOnIsNullAndTemporaryFalseOrderByCreatedOnAsc(
+		UUID modelId,
+		Pageable pageable
+	);
 }