Skip to content

Commit

Permalink
Merge pull request #8585 from guerler/fix_toolshed_error_parsing
Browse files Browse the repository at this point in the history
Fix parsing of errors in toolshed interface
  • Loading branch information
dannon committed Sep 6, 2019
2 parents 431c96d + b8c498e commit b70871a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions client/galaxy/scripts/components/Toolshed/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class Services {
const response = await axios.get(url);
return response.data;
} catch (e) {
return this._errorMessage(e);
this._errorMessage(e);
}
}
async getRepositories(params) {
Expand All @@ -27,7 +27,7 @@ export class Services {
});
return incoming;
} catch (e) {
return this._errorMessage(e);
this._errorMessage(e);
}
}
async getDetails(toolshedUrl, repository_id) {
Expand All @@ -48,7 +48,7 @@ export class Services {
});
return table;
} catch (e) {
return `${this._errorMessage(e)}, ${url}`;
this._errorMessage(e);
}
}
async getInstalledRepositories(repo) {
Expand Down Expand Up @@ -76,7 +76,7 @@ export class Services {
const response = await axios.post(url, payload);
return response.data;
} catch (e) {
return this._errorMessage(e);
this._errorMessage(e);
}
}
async uninstallRepository(params) {
Expand All @@ -88,7 +88,7 @@ export class Services {
const response = await axios.delete(url);
return response.data;
} catch (e) {
return this._errorMessage(e);
this._errorMessage(e);
}
}
_formatCount(value) {
Expand All @@ -100,7 +100,7 @@ export class Services {
if (e.response) {
message = e.response.data.err_msg || `${e.response.statusText} (${e.response.status})`;
}
return message;
throw message;
}
_getParamString(params) {
return Object.keys(params).reduce(function(previous, key) {
Expand Down

0 comments on commit b70871a

Please sign in to comment.