Change error handling in setIPs action

pull/15643/head
jesusbotella 4 years ago
parent 8cbe76a52b
commit 74d3ff4927

@ -172,7 +172,7 @@ export default {
return this.$store.dispatch('directDBConnection/ip/set', ipListWithNewIp);
})
.then(() => ({ isValid: true }))
.catch(errorData => ({ isValid: false, errorText: errorData.errors.ips.join('. ') }));
.catch(errorText => ({ isValid: false, errorText }));
},
onIPsChanged ({ removedElement }) {

@ -21,10 +21,14 @@ export function setIPs (context, ips) {
context.rootState.client.directDBConnection().setIPs(ips,
function (err, _, data) {
if (err) {
const error = data.responseJSON && data.responseJSON.errors ||
{ message: data.responseText || data.statusText };
context.commit('setIPsRequestError', error);
return reject(error);
const errorMessage =
(data.responseJSON && data.responseJSON.errors && data.responseJSON.errors.ips.join('. ')) ||
(data.responseJSON && data.responseJSON.errors) ||
data.responseText ||
data.statusText;
context.commit('setIPsRequestError', errorMessage);
return reject(errorMessage);
}
const ips = data.ips || [];

Loading…
Cancel
Save