diff --git a/app/js/components/manageApps/Addon.jsx b/app/js/components/manageApps/Addon.jsx index 208d2ea..a1df1f1 100644 --- a/app/js/components/manageApps/Addon.jsx +++ b/app/js/components/manageApps/Addon.jsx @@ -69,12 +69,15 @@ class Addon extends Component { axios.get(`${urlPrefix}/${apiBaseUrl}${this.requestUrl}`) .then(response => { this.getAffectedModules(response.data.uuid); - this.setState({ - app: response.data, - loadingComplete: true, - }); + return axios.get(`${ApiHelper.getAddonUrl()}?modulePackage=${response.data.packageName}`) + .then(response => { + this.setState({ + app: response.data, + loadingComplete: true, + }); + }); }).catch((error) => { - error.response.status === 401 ? location.href = `${location.href.substr(0, location.href.indexOf(location.href.split('/')[4]))}login.htm` : null; + error && error.response && error.response.status === 401 ? location.href = `${location.href.substr(0, location.href.indexOf(location.href.split('/')[4]))}login.htm` : null; this.setState({ loadingComplete: true }); }); @@ -277,7 +280,10 @@ class Addon extends Component { messageBody, messageType, showMessage } = this.state; - + + const developerName = app && app.developer ? app.developer.name : null; + const maintainers = app.maintainers ? app.maintainers : developerName; + const message = app.startupErrorMessage && app.startupErrorMessage.length > 0 ? 'Error starting ' : null; @@ -330,7 +336,7 @@ class Addon extends Component {
{app.description}
- {app.uuid ? + {app.uid || app.uuid ?NOTE: Adding, removing, or starting modules will restart OpenMRS, meaning that all scheduled tasks and background processes will be interrupted.
: null @@ -354,7 +360,11 @@ class Addon extends Component {