Merge branch 'dev/rc9.3' of github.com:CBIIT/NBIA-TCIA into dev/rc9.3

CBIIT · Nov 26, 2024 · eb0327a · eb0327a
2 parents ab9762f + d1e0bd4
commit eb0327a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/...lts-section-module/search-results-section-bravo/search-results-section-bravo.component.ts b/...lts-section-module/search-results-section-bravo/search-results-section-bravo.component.ts
@@ -423,7 +423,9 @@ export class SearchResultsSectionBravoComponent implements OnInit, OnDestroy{
             Properties.OHIF_STUDY_PARAMETER +  
             this.searchResults[i]['study'] + '&' +
             Properties.OHIF_SERIES_PARAMETER + 
-            this.searchResults[i]['series'];
+            this.searchResults[i]['series'] +
+            '&token=' +
+            this.accessTokenService.getAccessToken();
         window.open( ohifUrl, '_blank' );
     }
 

diff --git a/software/nbia-admin/src/assets/properties.ts b/software/nbia-admin/src/assets/properties.ts
@@ -7,7 +7,7 @@ export let Properties = {
     CURRENT_YEAR:'2024',
     VERSION: '9.3',
     TEST_VERSION: '9.3',
-    RELEASE_COMMIT: '7157ca33',
+    RELEASE_COMMIT: '21387774',
 
     MAX_CRITERIA_LEN: 30,
 
@@ -74,14 +74,14 @@ export let Properties = {
 
     // This value can be changed in the config file.
     // If this is left an empty string, the API server url will be used .
-    OHIF_SERVER_URL: 'https://dicom.cancerimagingarchive.net',
+    OHIF_SERVER_URL: '',
     MAX_VIDEO_FPS: 30,
 
     // The path and parameters must be filled out, even if server url is left empty
-    OHIF_SERVER_PATH: 'ohif-viewer',
+    OHIF_SERVER_PATH: 'viewer',
 
-    OHIF_STUDY_PARAMETER: 'StudyInstanceUID=',
-    OHIF_SERIES_PARAMETER: 'SeriesInstanceUID=',
+    OHIF_STUDY_PARAMETER: 'study=',
+    OHIF_SERIES_PARAMETER: 'series=',
 
 
     HAVE_URL_TOKEN: false,

diff --git a/software/nbia-search/src/app/image-search/services/ohif-viewer.service.ts b/software/nbia-search/src/app/image-search/services/ohif-viewer.service.ts
@@ -12,13 +12,13 @@ export class OhifViewerService{
 
     // TODO add header with access token
     launchOhifViewerSeries( seriesId, studyId ) {
-        let ohifUrl = Properties.OHIF_SERVER_URL + '/' + Properties.OHIF_SERVER_PATH  + '?' + Properties.OHIF_STUDY_PARAMETER + studyId + '&'+ Properties.OHIF_SERIES_PARAMETER + seriesId; 
+        let ohifUrl = Properties.OHIF_SERVER_URL + '/' + Properties.OHIF_SERVER_PATH  + '?' + Properties.OHIF_STUDY_PARAMETER + studyId + '&'+ Properties.OHIF_SERIES_PARAMETER + seriesId + '&token=' + this.apiServerService.showToken();
         console.log( 'ohifUrl: ', ohifUrl );
         window.open( ohifUrl, '_blank' );
     }
 
     launchOhifViewerStudy( studyId ) {
-        let ohifUrl = Properties.OHIF_SERVER_URL + '/' + Properties.OHIF_SERVER_PATH  + '?' + Properties.OHIF_STUDY_PARAMETER + studyId;
+        let ohifUrl = Properties.OHIF_SERVER_URL + '/' + Properties.OHIF_SERVER_PATH  + '?' + Properties.OHIF_STUDY_PARAMETER + studyId + '&token=' + this.apiServerService.showToken();
         console.log( 'ohifUrl: ', ohifUrl );
         window.open( ohifUrl, '_blank' );
     }

diff --git a/software/nbia-search/src/assets/properties.ts b/software/nbia-search/src/assets/properties.ts
@@ -8,7 +8,7 @@ export let Properties = {
     CURRENT_YEAR:'2024',
     VERSION: '9.3',
     TEST_VERSION: '9.3',
-    RELEASE_COMMIT: '7157ca33',
+    RELEASE_COMMIT: '21387774',
 
     // This is the text that appears in the clients browser tab or window
     TITLE: 'Search',
@@ -32,13 +32,13 @@ export let Properties = {
 
     // This value can be changed in the config file.
     // If this is left an empty string, the API server url will be used .
-    OHIF_SERVER_URL: 'https://dicom.cancerimagingarchive.net',
+    OHIF_SERVER_URL: '',
 
     // The path and parameters must be filled out, even if server url is left empty
-    OHIF_SERVER_PATH: 'ohif-viewer',
+    OHIF_SERVER_PATH: 'viewer',
 
-    OHIF_STUDY_PARAMETER: 'StudyInstanceUID=',
-    OHIF_SERIES_PARAMETER: 'SeriesInstanceUID=',
+    OHIF_STUDY_PARAMETER: 'study=',
+    OHIF_SERIES_PARAMETER: 'series=',
 
     // This value can be changed in the config file.
     // Show the OHIF viewer button at the Subject and Study levels - Don't set this to "true" yet...