Skip to content

Commit f3521f4

Browse files
Fix dicom viewer/server url logic (#1433)
1 parent f012320 commit f3521f4

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/GuppyDataExplorer/ExplorerTable/index.jsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,11 @@ class ExplorerTable extends React.Component {
113113

114114
// if this field is the `dicomViewerId`, convert the value to a link to the DICOM viewer
115115
if (this.props.tableConfig.dicomViewerId && this.props.tableConfig.dicomViewerId === field && valueStr) {
116+
let dicomViewerLink = `${hostname}dicom-viewer/viewer/${valueStr}`; // default: v2 ohif viewer url format
116117
if (this.props.tableConfig.dicomViewerUrl) {
117-
dicomViewerUrl = this.props.tableConfig.dicomViewerUrl;
118-
} else {
119-
dicomViewerUrl = "dicom-viewer";
118+
// v3 ohif viewer url format
119+
dicomViewerLink = `${hostname}${this.props.tableConfig.dicomViewerUrl}/viewer?StudyInstanceUIDs=${valueStr}`;
120120
}
121-
let dicomViewerLink = `${hostname}${dicomViewerUrl}/viewer/${valueStr}`;
122121
if (row.original.has_dicom_images !== undefined && !row.original.has_dicom_images) {
123122
dicomViewerLink = undefined;
124123
}
@@ -248,11 +247,10 @@ class ExplorerTable extends React.Component {
248247
if (haveField.length === this.props.rawData.length) {
249248
this.setState({ loading: true });
250249
// eslint-disable-next-line array-callback-return
251-
250+
251+
let dicomServerURL = "dicom-server";
252252
if (this.props.tableConfig.dicomServerURL) {
253253
dicomServerURL = this.props.tableConfig.dicomServerURL;
254-
} else {
255-
dicomServerURL = "dicom-server";
256254
}
257255

258256
Promise.all(this.props.rawData.map((x) => {

0 commit comments

Comments
 (0)