diff --git a/Packages-react/ohif-core b/Packages-react/ohif-core index 7e91734ef..610954427 160000 --- a/Packages-react/ohif-core +++ b/Packages-react/ohif-core @@ -1 +1 @@ -Subproject commit 7e91734ef10616b93831cc5f166d5695cd92b0f0 +Subproject commit 610954427c78209f387581aad569f8391edd8665 diff --git a/Packages-react/ohif-viewer/package.json b/Packages-react/ohif-viewer/package.json index c969654e4..c53b00d2e 100644 --- a/Packages-react/ohif-viewer/package.json +++ b/Packages-react/ohif-viewer/package.json @@ -98,9 +98,9 @@ "classnames": "^2.2.6", "cornerstone-core": "^2.2.8", "cornerstone-math": "^0.1.8", - "cornerstone-tools": "^3.1.0", + "cornerstone-tools": "^3.2.0", "cornerstone-wado-image-loader": "^2.2.3", - "dcmjs": "^0.3.3", + "dcmjs": "^0.3.4", "dicom-parser": "^1.8.3", "dicomweb-client": "^0.4.2", "hammerjs": "^2.0.8", @@ -120,7 +120,7 @@ "react-resize-detector": "^3.4.0", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", - "react-viewerbase": "^0.2.7", + "react-viewerbase": "^0.2.8", "redux": "^4.0.1", "redux-oidc": "^3.1.0" } diff --git a/Packages-react/ohif-viewer/src/App.js b/Packages-react/ohif-viewer/src/App.js index 67f5a8900..d865c7e61 100644 --- a/Packages-react/ohif-viewer/src/App.js +++ b/Packages-react/ohif-viewer/src/App.js @@ -211,6 +211,26 @@ function handleWebWorkerInit(basename) { cornerstoneWADOImageLoader.webWorkerManager.initialize(config); } +/** + * Set or update the HTML Base tag present on the document + * to point to the provided ROOT Url. + * + * @param rootUrl + */ +function updateBaseTag(rootUrl) { + const bases = document.getElementsByTagName('base'); + let baseHref = rootUrl; + baseHref += baseHref.endsWith('/') ? '' : '/'; + + if (bases.length > 1) { + throw new Error('For some reason there is more than one base tag present.'); + } else if (bases.length === 1) { + bases[0].href = baseHref; + } else { + document.write(``); + } +} + class App extends Component { static propTypes = { servers: PropTypes.object, @@ -231,6 +251,7 @@ class App extends Component { this.userManager = handleOIDC(this.props.oidc); handleServers(this.props.servers); handleWebWorkerInit(this.props.rootUrl); + updateBaseTag(this.props.rootUrl); } render() { diff --git a/Packages-react/ohif-viewer/src/sha.js b/Packages-react/ohif-viewer/src/sha.js index 2b98f735b..b2fe220cf 100644 --- a/Packages-react/ohif-viewer/src/sha.js +++ b/Packages-react/ohif-viewer/src/sha.js @@ -1 +1 @@ -export default '94ab9ff791bb7d2ad2745df8ff2c994317788751'; +export default '126babe4ee2760a605c0f18e54376b2db431fa1a'; diff --git a/Packages-react/ohif-viewer/src/studylist/StudyListWithData.js b/Packages-react/ohif-viewer/src/studylist/StudyListWithData.js index 46d25422f..dc0407f65 100644 --- a/Packages-react/ohif-viewer/src/studylist/StudyListWithData.js +++ b/Packages-react/ohif-viewer/src/studylist/StudyListWithData.js @@ -118,7 +118,6 @@ class StudyListWithData extends Component { }; onSearch = searchData => { - // TODO: Update search filters this.searchForStudies(searchData); }; diff --git a/Packages-react/ohif-viewer/yarn.lock b/Packages-react/ohif-viewer/yarn.lock index c6cf5fe57..ad88aa33d 100644 --- a/Packages-react/ohif-viewer/yarn.lock +++ b/Packages-react/ohif-viewer/yarn.lock @@ -2751,10 +2751,10 @@ cornerstone-math@^0.1.7, cornerstone-math@^0.1.8: resolved "https://registry.yarnpkg.com/cornerstone-math/-/cornerstone-math-0.1.8.tgz#68ab1f9e4fdcd7c5cb23a0d2eb4263f9f894f1c5" integrity sha512-x7NEQHBtVG7j1yeyj/aRoKTpXv1Vh2/H9zNLMyqYJDtJkNng8C4Q8M3CgZ1qer0Yr7eVq2x+Ynmj6kfOm5jXKw== -cornerstone-tools@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cornerstone-tools/-/cornerstone-tools-3.1.0.tgz#dedecfc038e2f0b984c77bfa74a12810c6fe95f3" - integrity sha512-wOolSXgRkG6wgjV4c44zocZhC9FmtWq+X5V1bAsc6VnIi8efSlwdRG3J6uUguQ+G5oYuCT+794Thj4LEPYb3RQ== +cornerstone-tools@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/cornerstone-tools/-/cornerstone-tools-3.2.0.tgz#23b8bfe0f388cfb8e1b489822d53c57a0fd1c484" + integrity sha512-IXr2P5BqzASLvG4Ky1/E9odaA2iKpsPVqPGH07pQkW54gXv0c5oBuRYIwM0nY89C5A+XZtM0nMosKY0cG9cDbg== dependencies: "@babel/runtime" "7.1.2" cornerstone-math "^0.1.7" @@ -3142,14 +3142,14 @@ date-now@^0.1.4: resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -dcmjs@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.3.3.tgz#c0e0564008fd8edc52574eb847a2123c95864cdf" - integrity sha512-hfdRfeb+Fqerrbr/lsqQerIjfJHNWbG1MOMyp772uO+n5rmkC/ASoBa9bURAHAJKwRVjkLraULMFmGJD+5oRnQ== +dcmjs@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.3.4.tgz#c9cf70843e66ad499cb7d3bd0c4a4fba1352a9d2" + integrity sha512-sVSB66dIIXWilSjs0wcp7b5ZF1jS+sEJWItx5pP0jlRTX7sZ/5nuzWGBCQfZo5VLgSo0a1NnHjljpLzbgDdzxA== dependencies: "@babel/polyfill" "^7.2.5" "@babel/runtime" "^7.3.1" - loglevel "^1.6.1" + loglevelnext "^3.0.0" debug@*, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0: version "4.1.1" @@ -6963,11 +6963,16 @@ log-update@^2.3.0: cli-cursor "^2.0.0" wrap-ansi "^3.0.1" -loglevel@^1.4.1, loglevel@^1.6.1: +loglevel@^1.4.1: version "1.6.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po= +loglevelnext@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-3.0.0.tgz#cd0f094acc488adf143d7b099927054b1a296124" + integrity sha512-QpOjsecBDe3lI9sDcdCyVbuMsit3T15Qluf4C7MoYeeR6jmqSOvH3QFctZtygfIdGJLlchdN7JSjSVhOhZ3HxQ== + longest-streak@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz#2421b6ba939a443bb9ffebf596585a50b4c38e2e" @@ -7806,10 +7811,10 @@ octal@^1.0.0: resolved "https://registry.yarnpkg.com/octal/-/octal-1.0.0.tgz#63e7162a68efbeb9e213588d58e989d1e5c4530b" integrity sha1-Y+cWKmjvvrniE1iNWOmJ0eXEUws= -ohif-core@^0.2.9: - version "0.2.9" - resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.2.9.tgz#0e01e47bd71d6be0586732a50f9444c764352edf" - integrity sha512-SmlnL+nmej8elXx/kFveyVzhWn1POeis1NqeqMJa96vBJfpFXx+pT44d+uMXUtkbL49Lr1B3GGlInldsh8Za6w== +ohif-core@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.3.0.tgz#c9dc35a6a9a2b92571facfc01a439a8408c336b2" + integrity sha512-FvlGHTyN2ZoR5wpxsz/oNsrh0u9uFSKyikJecFbZN2izEbHH60+KMVeG0uSJtlSymmEdoWtIottiQsm/pOyHhA== dependencies: "@babel/runtime" "^7.2.0" dicomweb-client "^0.4.2" @@ -7820,15 +7825,15 @@ ohif-core@^0.2.9: lodash.merge "^4.6.1" validate.js "^0.12.0" -ohif-cornerstone-extension@^0.0.15: - version "0.0.15" - resolved "https://registry.yarnpkg.com/ohif-cornerstone-extension/-/ohif-cornerstone-extension-0.0.15.tgz#5e97987db8393aade2dbc41df58c7618db9e248d" - integrity sha512-uXUDmh164ifkmeYL48cqLYhUBKXwjUIArc8JaMq6DC6PU+/doXzc1yIaMa36c2U3mQ4N5WdOFl5dVEng0YIDFA== +ohif-cornerstone-extension@0.0.16: + version "0.0.16" + resolved "https://registry.yarnpkg.com/ohif-cornerstone-extension/-/ohif-cornerstone-extension-0.0.16.tgz#5320ced8b7599c6f9e27c966dff74f87e32de15b" + integrity sha512-qT0/FvutUlNC6TPZnSUh5DHUidcduf7zvml8MQESIfDp5nI0ffsMR2EjWK8R9+0DOpHwZjVttoxlDJJWuVsggw== dependencies: "@babel/runtime" "^7.2.0" classnames "^2.2.6" lodash.throttle "^4.1.1" - react-cornerstone-viewport "^0.1.13" + react-cornerstone-viewport "^0.1.14" ohif-dicom-html-extension@^0.0.2: version "0.0.2" @@ -9435,10 +9440,10 @@ react-bootstrap-modal@^4.2.0: react-overlays "^0.8.0" react-transition-group "^2.0.0" -react-cornerstone-viewport@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.13.tgz#ef95634e08a3fc12c8a2c8b01929610db515f041" - integrity sha512-J2FHcEj4igUfwdZV8y8c7YmBtwLhmGbytvnk5vecc4FQvM4/tYUiuvzJe1hZQtMvJpOqSzd0UKe2fs6u3OroJg== +react-cornerstone-viewport@^0.1.14: + version "0.1.15" + resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.15.tgz#be2743cb027f9eb7848910bee53b37e85f46d9a4" + integrity sha512-GwrVRWeStycL15VrmVZezulIpb8fLGOpg/MrIM0va5s6EfFZSGRqwTcM/1WZZOvKAdRr8y+SDmITiacy5+r3kg== dependencies: lodash.debounce "^4.0.8" moment "^2.23.0" @@ -9692,10 +9697,10 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react-viewerbase@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.2.6.tgz#8209d8f063f9e1e20bf41ab6d5ef17d0839fd601" - integrity sha512-fHxnooBVgs+CvvAYPqisYpTaSuamswEC+bPEASkbQdnXnCqpI4He66eW44vEdizQcc4C+FBtPrZRG1fnUPcfsQ== +react-viewerbase@^0.2.8: + version "0.2.8" + resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.2.8.tgz#bbb483c69e11ab49b33308e58c813443f7df033b" + integrity sha512-fEe4Ku6OqMZ4byi18v9i4v4RubMT21EITcKWNP+rvc4cqNKBVKBdc4OYfZCJn11ctR61p1uVCM8e6KeG/rE3Qg== dependencies: "@babel/runtime" "^7.2.0" classnames "^2.2.6" diff --git a/Packages-react/react-cornerstone-viewport b/Packages-react/react-cornerstone-viewport index 3f2d6cdf6..8bfdda9e3 160000 --- a/Packages-react/react-cornerstone-viewport +++ b/Packages-react/react-cornerstone-viewport @@ -1 +1 @@ -Subproject commit 3f2d6cdf6409db98ff3777a0d186799b33cf608e +Subproject commit 8bfdda9e3357a0c555e10e903fc019f1c1d98394 diff --git a/Packages-react/react-viewerbase b/Packages-react/react-viewerbase index 68c50953e..cc44dd73c 160000 --- a/Packages-react/react-viewerbase +++ b/Packages-react/react-viewerbase @@ -1 +1 @@ -Subproject commit 68c50953e4b75f3a7c56ed36cf921078f238729d +Subproject commit cc44dd73cc48f11f29ee55564f5538e068682012