feat(StudyList): Disable study list link/route using 'showStudyList' config property (#597)

fix #574
This commit is contained in:
João Felipe de Medeiros Moreira authored and Erik Ziegler committed 2019-07-08 21:29:59 +02:00
1 parent 571dd5848f
commit 4b3994e788
10 files changed
+31 -9

No files matched your search

+1
View File
@@ -3,6 +3,7 @@ window.config = {
routerBasename: '/',
// default: ''
relativeWebWorkerScriptsPath: '',
showStudyList: true,
servers: {
dicomWeb: [
{
+1
View File
@@ -1,5 +1,6 @@
window.config = {
routerBasename: '/',
showStudyList: true,
servers: {
dicomWeb: [
{
+1
View File
@@ -1,5 +1,6 @@
window.config = {
routerBasename: '/',
showStudyList: true,
relativeWebWorkerScriptsPath: '',
servers: {
dicomWeb: [
@@ -1,5 +1,6 @@
window.config = {
routerBasename: '/',
showStudyList: true,
relativeWebWorkerScriptsPath: '',
servers: {
// This is an array, but we'll only use the first entry for now
@@ -1,5 +1,6 @@
window.config = {
routerBasename: '/',
showStudyList: true,
relativeWebWorkerScriptsPath: '',
servers: {
// This is an array, but we'll only use the first entry for now
+1
View File
@@ -2,6 +2,7 @@ window.config = {
// default: '/'
routerBasename: '/',
// default: ''
showStudyList: true,
relativeWebWorkerScriptsPath: '',
servers: {
dicomWeb: [
+1
View File
@@ -1,5 +1,6 @@
window.config = {
routerBasename: '/demo',
showStudyList: true,
servers: {
dicomWeb: [
{
+1
View File
@@ -1,5 +1,6 @@
window.config = {
routerBasename: '/',
showStudyList: true,
servers: {
dicomWeb: [
{
+18 -8
View File
@@ -42,6 +42,9 @@ class OHIFStandaloneViewer extends Component {
static propTypes = {
history: PropTypes.object.isRequired,
user: PropTypes.object,
setContext: PropTypes.func,
userManager: PropTypes.object,
location: PropTypes.object,
};
componentDidMount() {
@@ -93,14 +96,6 @@ class OHIFStandaloneViewer extends Component {
* See http://reactcommunity.org/react-transition-group/with-react-router/
*/
const routes = [
{
path: '/',
Component: StudyListRouting,
},
{
path: '/studylist',
Component: StudyListRouting,
},
{
path: '/viewer',
Component: StandaloneRouting,
@@ -119,6 +114,21 @@ class OHIFStandaloneViewer extends Component {
},
];
const showStudyList =
window.config.showStudyList !== undefined
? window.config.showStudyList
: true;
if (showStudyList) {
routes.push({
path: '/studylist',
Component: StudyListRouting,
});
routes.push({
path: '/',
Component: StudyListRouting,
});
}
const currentPath = this.props.location.pathname;
const noMatchingRoutes = !routes.find(r =>
matchPath(currentPath, {
+5 -1
View File
@@ -71,6 +71,10 @@ class Header extends Component {
render() {
const { t } = this.props;
const showStudyList =
window.config.showStudyList !== undefined
? window.config.showStudyList
: true;
return (
<div className={`entry-header ${this.props.home ? 'header-big' : ''}`}>
<div className="header-left-box">
@@ -85,7 +89,7 @@ class Header extends Component {
{this.props.children}
{!this.props.home && (
{showStudyList && !this.props.home && (
<Link
className="header-btn header-studyListLinkSection"
to={{