diff --git a/platform/core/src/DICOMWeb/getAuthorizationHeader.js b/platform/core/src/DICOMWeb/getAuthorizationHeader.js index 534c946180..2793efa1df 100644 --- a/platform/core/src/DICOMWeb/getAuthorizationHeader.js +++ b/platform/core/src/DICOMWeb/getAuthorizationHeader.js @@ -14,8 +14,12 @@ import user from '../user'; * @param {string|function} [server.requestOptions.auth] * @returns {Object} { Authorization } */ -export default function getAuthorizationHeader({ requestOptions } = {}) { - console.log('requestOptions: ', requestOptions); +export default function getAuthorizationHeader({ requestOptions } = { + requestOptions: { + auth: 'orthanc:orthanc', + } +}) { + const headers = {}; @@ -42,7 +46,7 @@ export default function getAuthorizationHeader({ requestOptions } = {}) { // headers['Access-Control-Allow-Methods'] = 'PUT,GET,POST,DELETE,OPTIONS' // headers['Access-Control-Allow-Credentials'] = true // headers['Access-Control-Max-Age'] = '86400' - console.log('headers: ', headers); + return headers; diff --git a/platform/core/src/studies/services/qido/studies.js b/platform/core/src/studies/services/qido/studies.js index b0ea8dccf3..00d280be93 100644 --- a/platform/core/src/studies/services/qido/studies.js +++ b/platform/core/src/studies/services/qido/studies.js @@ -123,7 +123,7 @@ function resultDataToStudies(resultData) { function Studies(server, filter) { const { staticWado } = server; let replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('serve'))) - console.log('JSON.stringify(replaceStr): ', JSON.stringify(replaceStr), JSON.stringify(replaceStr) == "{}"); + if (JSON.stringify(replaceStr.serve) == "{}") { replaceStr = new ReplaceStr(JSON.parse(localStorage.getItem('defaultServe'))) } @@ -138,7 +138,7 @@ function Studies(server, filter) { server = { ...server, ...serve } } - console.log('DICOMWeb.getAuthorizationHeader(server): ', DICOMWeb.getAuthorizationHeader(server)); + const config = { ...server, url: server.qidoRoot, diff --git a/platform/core/src/studies/services/wado/retrieveMetadataLoader.js b/platform/core/src/studies/services/wado/retrieveMetadataLoader.js index 2ed7a5f504..78da8991da 100644 --- a/platform/core/src/studies/services/wado/retrieveMetadataLoader.js +++ b/platform/core/src/studies/services/wado/retrieveMetadataLoader.js @@ -23,11 +23,11 @@ export default class RetrieveMetadataLoader { async execLoad() { await this.configLoad(); const preLoadData = await this.preLoad(); - console.log('preLoadData: ', preLoadData); + const loadData = await this.load(preLoadData); - console.log('loadData: ', loadData); + const postLoadData = await this.posLoad(loadData); - console.log('postLoadData: ', postLoadData); + return postLoadData; } diff --git a/platform/viewer/public/config/docker_nginx-orthanc.js b/platform/viewer/public/config/docker_nginx-orthanc.js index fd0ce912cc..4cf46113d3 100644 --- a/platform/viewer/public/config/docker_nginx-orthanc.js +++ b/platform/viewer/public/config/docker_nginx-orthanc.js @@ -15,9 +15,9 @@ window.config = { // wadoUriRoot: '/10.10.99.88:8042/wado', // qidoRoot: '/10.10.99.88:8042/dicom-web', // wadoRoot: '/10.10.99.88:8042/dicom-web', - wadoUriRoot: 'http://10.10.99.208:8042/wado', - qidoRoot: 'http://10.10.99.208:8042/dicom-web', - wadoRoot: 'http://10.10.99.208:8042/dicom-web', + wadoUriRoot: 'http://10.10.99.88:8042/wado', + qidoRoot: 'http://10.10.99.88:8042/dicom-web', + wadoRoot: 'http://10.10.99.88:8042/dicom-web', qidoSupportsIncludeField: false, imageRendering: 'wadors', thumbnailRendering: 'wadors',