Merge branch 'develop' of https://github.com/fli-iam/shanoir-ng into …

…shup-fixes-with-instances-null
fli-iam · Feb 4, 2025 · f7f837b · f7f837b
2 parents 50982cf + 547c93f
commit f7f837b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dicom/web/service/DICOMWebService.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/dicom/web/service/DICOMWebService.java
@@ -187,7 +187,9 @@ public ResponseEntity findFrameOfStudyOfSerieOfInstance(String studyInstanceUID,
 				if (entity != null) {
 					ByteArrayResource byteArrayResource = new ByteArrayResource(EntityUtils.toByteArray(entity));
 					HttpHeaders responseHeaders = new HttpHeaders();
-					responseHeaders.setContentLength(entity.getContentLength());
+					if (!entity.isChunked() && entity.getContentLength() >= 0) {
+						responseHeaders.setContentLength(entity.getContentLength());
+					}					
 					return new ResponseEntity(byteArrayResource, responseHeaders, HttpStatus.OK);
 				} else {
 					LOG.error("DICOMWeb: findFrameOfStudyOfSerieOfInstance: empty response entity.");				

diff --git a/shanoir-ng-front/src/app/studies/study/tree.service.ts b/shanoir-ng-front/src/app/studies/study/tree.service.ts
@@ -255,7 +255,7 @@ export class TreeService {
             return this.selectUser(selection.id);
         } else if (selection?.type == 'coil') {
             return this.selectCoil(selection.entity as Coil);
-        }
+        } else return Promise.resolve(null);
     }
 
     private selectDataset(dataset: number | Dataset): Promise<DatasetNode> {

diff --git a/shanoir-ng-studies/src/main/java/org/shanoir/ng/subject/controler/SubjectApiController.java b/shanoir-ng-studies/src/main/java/org/shanoir/ng/subject/controler/SubjectApiController.java
@@ -16,7 +16,9 @@
 
 
 import org.shanoir.ng.shared.configuration.RabbitMQConfiguration;
+
 import io.swagger.v3.oas.annotations.Parameter;
+
 import org.shanoir.ng.shared.core.model.IdName;
 import org.shanoir.ng.shared.error.FieldErrorMap;
 import org.shanoir.ng.shared.event.ShanoirEvent;
@@ -48,6 +50,8 @@
 import java.util.Comparator;
 import java.util.List;
 
+import jakarta.transaction.Transactional;
+
 @Controller
 public class SubjectApiController implements SubjectApi {
 
@@ -95,6 +99,7 @@ public ResponseEntity<SubjectDTO> findSubjectById(
 	}
 
 	@Override
+	@Transactional
 	public ResponseEntity<List<SubjectDTO>> findSubjects(boolean preclinical, boolean clinical) {
 		List<Subject> subjects = new ArrayList<>();
 		if(preclinical && clinical){